RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

Added concept of "mate" -- the other port on the same DUART. This is

Browse Source 
needed to properly handle the interrupt mask register since it is
shared.
This commit is contained in:
Joel Sherrill
1998-06-23 15:54:33 +00:00
parent b7ebcea33e
commit a5d0c7cf07
6 changed files with 160 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
c/src/lib/libchip/serial/mc68681.c
View File

@@ -166,9 +166,6 @@ static int mc68681_baud_rate(
return status; return status;
} }
#define MC68681_PORT_MASK( _port, _bits ) \
((_port) ? ((_bits) << 4) : (_bits))
static int mc68681_set_attributes( static int mc68681_set_attributes(
int minor, int minor,
const struct termios *t const struct termios *t
@@ -250,28 +247,96 @@ static int mc68681_set_attributes(
return 0; return 0;
} }
static void mc68681_initialize_context(
int minor,
mc68681_context *pmc68681Context
)
{
int port;
unsigned int pMC68681;
pMC68681 = Console_Port_Tbl[minor].ulCtrlPort1;
pmc68681Context->mate = -1;
for (port=0 ; port<Console_Port_Count ; port++ ) {
if ( Console_Port_Tbl[port].ulCtrlPort1 == pMC68681 ) {
pmc68681Context->mate = port;
break;
}
}
pmc68681Context->ucModemCtrl = 0x00; /* XXX */
}
static unsigned int mc68681_build_imr(
int minor
)
{
int mate;
unsigned int mask;
unsigned int mate_mask;
unsigned int pMC68681;
unsigned int pMC68681_port;
mc68681_context *pmc68681Context;
pMC68681 = Console_Port_Tbl[minor].ulCtrlPort1;
pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2;
pmc68681Context = (mc68681_context *) Console_Port_Data[minor].pDeviceContext;
mate = pmc68681Context->mate;
mate_mask = 0;
/*
* Decide if the other port on this DUART is using interrupts
*/
if ( mate != -1 ) {
if ( Console_Port_Tbl[mate].pDeviceFns->deviceOutputUsesInterrupts )
mate_mask = 0x03;
/*
* If equal, then minor is A so the mate must be B
*/
if ( pMC68681 == pMC68681_port )
mate_mask <<= 4;
}
/*
* Add in minor's mask
*/
mask = 0;
if ( Console_Port_Tbl[minor].pDeviceFns->deviceOutputUsesInterrupts ) {
if ( pMC68681 == pMC68681_port )
mask = 0x03;
else
mask = 0x30;
}
return mask | mate_mask;
}
static void mc68681_init(int minor) static void mc68681_init(int minor)
{ {
/* XXX */
unsigned32 pMC68681_port; unsigned32 pMC68681_port;
unsigned32 pMC68681; unsigned32 pMC68681;
mc68681_context *pmc68681Context; mc68681_context *pmc68681Context;
setRegister_f setReg; setRegister_f setReg;
getRegister_f getReg; getRegister_f getReg;
unsigned int port;
pmc68681Context = (mc68681_context *) malloc(sizeof(mc68681_context)); pmc68681Context = (mc68681_context *) malloc(sizeof(mc68681_context));
Console_Port_Data[minor].pDeviceContext = (void *)pmc68681Context; Console_Port_Data[minor].pDeviceContext = (void *)pmc68681Context;
#if 0
pmc68681Context->ucModemCtrl = SP_MODEM_IRQ; mc68681_initialize_context( minor, pmc68681Context );
#endif
pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort1; pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort1;
pMC68681 = Console_Port_Tbl[minor].ulCtrlPort2; pMC68681 = Console_Port_Tbl[minor].ulCtrlPort2;
setReg = Console_Port_Tbl[minor].setRegister; setReg = Console_Port_Tbl[minor].setRegister;
getReg = Console_Port_Tbl[minor].getRegister; getReg = Console_Port_Tbl[minor].getRegister;
port = Console_Port_Tbl[minor].ulDataPort;
/* /*
* Reset everything and leave this port disabled. * Reset everything and leave this port disabled.
@@ -304,7 +369,6 @@ static int mc68681_open(
unsigned32 pMC68681_port; unsigned32 pMC68681_port;
unsigned int baud; unsigned int baud;
unsigned int acr; unsigned int acr;
unsigned int port;
unsigned int vector; unsigned int vector;
rtems_interrupt_level Irql; rtems_interrupt_level Irql;
setRegister_f setReg; setRegister_f setReg;
@@ -312,7 +376,6 @@ static int mc68681_open(
pMC68681 = Console_Port_Tbl[minor].ulCtrlPort1; pMC68681 = Console_Port_Tbl[minor].ulCtrlPort1;
pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2; pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2;
setReg = Console_Port_Tbl[minor].setRegister; setReg = Console_Port_Tbl[minor].setRegister;
port = Console_Port_Tbl[minor].ulDataPort;
vector = Console_Port_Tbl[minor].ulIntVector; vector = Console_Port_Tbl[minor].ulIntVector;
(void) mc68681_baud_rate( minor, B9600, &baud, &acr ); (void) mc68681_baud_rate( minor, B9600, &baud, &acr );
@@ -329,12 +392,6 @@ static int mc68681_open(
(*setReg)( pMC68681_port, MC68681_MODE, 0x07 ); (*setReg)( pMC68681_port, MC68681_MODE, 0x07 );
rtems_interrupt_enable(Irql); rtems_interrupt_enable(Irql);
(*setReg)(
pMC68681,
MC68681_INTERRUPT_MASK_REG,
MC68681_PORT_MASK( port, 0x03 ) /* intr on RX and TX -- not break */
);
(*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_ENABLE_TX ); (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_ENABLE_TX );
(*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_ENABLE_RX ); (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_ENABLE_RX );
@@ -359,24 +416,16 @@ static int mc68681_close(
{ {
unsigned32 pMC68681; unsigned32 pMC68681;
unsigned32 pMC68681_port; unsigned32 pMC68681_port;
unsigned int port;
setRegister_f setReg; setRegister_f setReg;
pMC68681 = Console_Port_Tbl[minor].ulCtrlPort1; pMC68681 = Console_Port_Tbl[minor].ulCtrlPort1;
pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2; pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2;
setReg = Console_Port_Tbl[minor].setRegister; setReg = Console_Port_Tbl[minor].setRegister;
port = Console_Port_Tbl[minor].ulDataPort;
/* /*
* Disable interrupts from this channel and then disable it totally. * Disable interrupts from this channel and then disable it totally.
*/ */
(*setReg)(
pMC68681,
MC68681_INTERRUPT_MASK_REG,
MC68681_PORT_MASK( port, 0x03 ) /* intr on RX and TX -- not break */
);
(*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_DISABLE_TX ); (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_DISABLE_TX );
(*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_DISABLE_RX ); (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_DISABLE_RX );
@@ -687,36 +736,23 @@ static int mc68681_flush(int major, int minor, void *arg)
* *
* This routine initializes the console's receive and transmit * This routine initializes the console's receive and transmit
* ring buffers and loads the appropriate vectors to handle the interrupts. * ring buffers and loads the appropriate vectors to handle the interrupts.
*
* Input parameters: NONE
*
* Output parameters: NONE
*
* Return values: NONE
*/ */
static void mc68681_enable_interrupts( static void mc68681_enable_interrupts(
int minor int minor
) )
{ {
/* XXX */
unsigned32 pMC68681; unsigned32 pMC68681;
unsigned8 ucDataByte;
setRegister_f setReg; setRegister_f setReg;
#if 1
ucDataByte = 0;
#endif
pMC68681 = Console_Port_Tbl[minor].ulCtrlPort1; pMC68681 = Console_Port_Tbl[minor].ulCtrlPort1;
setReg = Console_Port_Tbl[minor].setRegister; setReg = Console_Port_Tbl[minor].setRegister;
#if 0
/* /*
* Enable interrupts * Enable interrupts on RX and TX -- not break
*/ */
ucDataByte = SP_INT_RX_ENABLE | SP_INT_TX_ENABLE;
(*setReg)(pMC68681, MC68681_INTERRUPT_ENABLE, ucDataByte); (*setReg)( pMC68681, MC68681_INTERRUPT_MASK_REG, mc68681_build_imr( minor ));
#endif
} }
static void mc68681_initialize_interrupts(int minor) static void mc68681_initialize_interrupts(int minor)

5
c/src/lib/libchip/serial/mc68681.h
View File

@@ -36,11 +36,8 @@ extern "C" {
* Data Port bit map configuration * Data Port bit map configuration
*/ */
#define MC68681_DATA_PORT_A 0
#define MC68681_DATA_PORT_B 1
#define MC68681_DATA_BAUD_RATE_SET_1 0 #define MC68681_DATA_BAUD_RATE_SET_1 0
#define MC68681_DATA_BAUD_RATE_SET_2 2 #define MC68681_DATA_BAUD_RATE_SET_2 1
/* /*
* Driver function table * Driver function table

3
c/src/lib/libchip/serial/mc68681_p.h
View File

@@ -224,7 +224,8 @@ extern "C" {
typedef struct _mc68681_context typedef struct _mc68681_context
{ {
unsigned8 ucModemCtrl; int mate;
unsigned8 ucModemCtrl;
} mc68681_context; } mc68681_context;
/* /*

118
c/src/libchip/serial/mc68681.c
View File

@@ -166,9 +166,6 @@ static int mc68681_baud_rate(
return status; return status;
} }
#define MC68681_PORT_MASK( _port, _bits ) \
((_port) ? ((_bits) << 4) : (_bits))
static int mc68681_set_attributes( static int mc68681_set_attributes(
int minor, int minor,
const struct termios *t const struct termios *t
@@ -250,28 +247,96 @@ static int mc68681_set_attributes(
return 0; return 0;
} }
static void mc68681_initialize_context(
int minor,
mc68681_context *pmc68681Context
)
{
int port;
unsigned int pMC68681;
pMC68681 = Console_Port_Tbl[minor].ulCtrlPort1;
pmc68681Context->mate = -1;
for (port=0 ; port<Console_Port_Count ; port++ ) {
if ( Console_Port_Tbl[port].ulCtrlPort1 == pMC68681 ) {
pmc68681Context->mate = port;
break;
}
}
pmc68681Context->ucModemCtrl = 0x00; /* XXX */
}
static unsigned int mc68681_build_imr(
int minor
)
{
int mate;
unsigned int mask;
unsigned int mate_mask;
unsigned int pMC68681;
unsigned int pMC68681_port;
mc68681_context *pmc68681Context;
pMC68681 = Console_Port_Tbl[minor].ulCtrlPort1;
pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2;
pmc68681Context = (mc68681_context *) Console_Port_Data[minor].pDeviceContext;
mate = pmc68681Context->mate;
mate_mask = 0;
/*
* Decide if the other port on this DUART is using interrupts
*/
if ( mate != -1 ) {
if ( Console_Port_Tbl[mate].pDeviceFns->deviceOutputUsesInterrupts )
mate_mask = 0x03;
/*
* If equal, then minor is A so the mate must be B
*/
if ( pMC68681 == pMC68681_port )
mate_mask <<= 4;
}
/*
* Add in minor's mask
*/
mask = 0;
if ( Console_Port_Tbl[minor].pDeviceFns->deviceOutputUsesInterrupts ) {
if ( pMC68681 == pMC68681_port )
mask = 0x03;
else
mask = 0x30;
}
return mask | mate_mask;
}
static void mc68681_init(int minor) static void mc68681_init(int minor)
{ {
/* XXX */
unsigned32 pMC68681_port; unsigned32 pMC68681_port;
unsigned32 pMC68681; unsigned32 pMC68681;
mc68681_context *pmc68681Context; mc68681_context *pmc68681Context;
setRegister_f setReg; setRegister_f setReg;
getRegister_f getReg; getRegister_f getReg;
unsigned int port;
pmc68681Context = (mc68681_context *) malloc(sizeof(mc68681_context)); pmc68681Context = (mc68681_context *) malloc(sizeof(mc68681_context));
Console_Port_Data[minor].pDeviceContext = (void *)pmc68681Context; Console_Port_Data[minor].pDeviceContext = (void *)pmc68681Context;
#if 0
pmc68681Context->ucModemCtrl = SP_MODEM_IRQ; mc68681_initialize_context( minor, pmc68681Context );
#endif
pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort1; pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort1;
pMC68681 = Console_Port_Tbl[minor].ulCtrlPort2; pMC68681 = Console_Port_Tbl[minor].ulCtrlPort2;
setReg = Console_Port_Tbl[minor].setRegister; setReg = Console_Port_Tbl[minor].setRegister;
getReg = Console_Port_Tbl[minor].getRegister; getReg = Console_Port_Tbl[minor].getRegister;
port = Console_Port_Tbl[minor].ulDataPort;
/* /*
* Reset everything and leave this port disabled. * Reset everything and leave this port disabled.
@@ -304,7 +369,6 @@ static int mc68681_open(
unsigned32 pMC68681_port; unsigned32 pMC68681_port;
unsigned int baud; unsigned int baud;
unsigned int acr; unsigned int acr;
unsigned int port;
unsigned int vector; unsigned int vector;
rtems_interrupt_level Irql; rtems_interrupt_level Irql;
setRegister_f setReg; setRegister_f setReg;
@@ -312,7 +376,6 @@ static int mc68681_open(
pMC68681 = Console_Port_Tbl[minor].ulCtrlPort1; pMC68681 = Console_Port_Tbl[minor].ulCtrlPort1;
pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2; pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2;
setReg = Console_Port_Tbl[minor].setRegister; setReg = Console_Port_Tbl[minor].setRegister;
port = Console_Port_Tbl[minor].ulDataPort;
vector = Console_Port_Tbl[minor].ulIntVector; vector = Console_Port_Tbl[minor].ulIntVector;
(void) mc68681_baud_rate( minor, B9600, &baud, &acr ); (void) mc68681_baud_rate( minor, B9600, &baud, &acr );
@@ -329,12 +392,6 @@ static int mc68681_open(
(*setReg)( pMC68681_port, MC68681_MODE, 0x07 ); (*setReg)( pMC68681_port, MC68681_MODE, 0x07 );
rtems_interrupt_enable(Irql); rtems_interrupt_enable(Irql);
(*setReg)(
pMC68681,
MC68681_INTERRUPT_MASK_REG,
MC68681_PORT_MASK( port, 0x03 ) /* intr on RX and TX -- not break */
);
(*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_ENABLE_TX ); (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_ENABLE_TX );
(*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_ENABLE_RX ); (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_ENABLE_RX );
@@ -359,24 +416,16 @@ static int mc68681_close(
{ {
unsigned32 pMC68681; unsigned32 pMC68681;
unsigned32 pMC68681_port; unsigned32 pMC68681_port;
unsigned int port;
setRegister_f setReg; setRegister_f setReg;
pMC68681 = Console_Port_Tbl[minor].ulCtrlPort1; pMC68681 = Console_Port_Tbl[minor].ulCtrlPort1;
pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2; pMC68681_port = Console_Port_Tbl[minor].ulCtrlPort2;
setReg = Console_Port_Tbl[minor].setRegister; setReg = Console_Port_Tbl[minor].setRegister;
port = Console_Port_Tbl[minor].ulDataPort;
/* /*
* Disable interrupts from this channel and then disable it totally. * Disable interrupts from this channel and then disable it totally.
*/ */
(*setReg)(
pMC68681,
MC68681_INTERRUPT_MASK_REG,
MC68681_PORT_MASK( port, 0x03 ) /* intr on RX and TX -- not break */
);
(*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_DISABLE_TX ); (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_DISABLE_TX );
(*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_DISABLE_RX ); (*setReg)( pMC68681_port, MC68681_COMMAND, MC68681_MODE_REG_DISABLE_RX );
@@ -687,36 +736,23 @@ static int mc68681_flush(int major, int minor, void *arg)
* *
* This routine initializes the console's receive and transmit * This routine initializes the console's receive and transmit
* ring buffers and loads the appropriate vectors to handle the interrupts. * ring buffers and loads the appropriate vectors to handle the interrupts.
*
* Input parameters: NONE
*
* Output parameters: NONE
*
* Return values: NONE
*/ */
static void mc68681_enable_interrupts( static void mc68681_enable_interrupts(
int minor int minor
) )
{ {
/* XXX */
unsigned32 pMC68681; unsigned32 pMC68681;
unsigned8 ucDataByte;
setRegister_f setReg; setRegister_f setReg;
#if 1
ucDataByte = 0;
#endif
pMC68681 = Console_Port_Tbl[minor].ulCtrlPort1; pMC68681 = Console_Port_Tbl[minor].ulCtrlPort1;
setReg = Console_Port_Tbl[minor].setRegister; setReg = Console_Port_Tbl[minor].setRegister;
#if 0
/* /*
* Enable interrupts * Enable interrupts on RX and TX -- not break
*/ */
ucDataByte = SP_INT_RX_ENABLE | SP_INT_TX_ENABLE;
(*setReg)(pMC68681, MC68681_INTERRUPT_ENABLE, ucDataByte); (*setReg)( pMC68681, MC68681_INTERRUPT_MASK_REG, mc68681_build_imr( minor ));
#endif
} }
static void mc68681_initialize_interrupts(int minor) static void mc68681_initialize_interrupts(int minor)

5
c/src/libchip/serial/mc68681.h
View File

@@ -36,11 +36,8 @@ extern "C" {
* Data Port bit map configuration * Data Port bit map configuration
*/ */
#define MC68681_DATA_PORT_A 0
#define MC68681_DATA_PORT_B 1
#define MC68681_DATA_BAUD_RATE_SET_1 0 #define MC68681_DATA_BAUD_RATE_SET_1 0
#define MC68681_DATA_BAUD_RATE_SET_2 2 #define MC68681_DATA_BAUD_RATE_SET_2 1
/* /*
* Driver function table * Driver function table

3
c/src/libchip/serial/mc68681_p.h
View File

@@ -224,7 +224,8 @@ extern "C" {
typedef struct _mc68681_context typedef struct _mc68681_context
{ {
unsigned8 ucModemCtrl; int mate;
unsigned8 ucModemCtrl;
} mc68681_context; } mc68681_context;
/* /*