diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-04-26 00:58:39 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-04-26 00:58:39 +0000 |
| commit | 642c500988acf2a5adf9270ffd7416dbcba9e6c0 (patch) | |
| tree | ba0b24cad18c064a469726391ae4eec7aa1f51ad /c/src/libchip/serial/ns16550.c | |
| parent | 2010-04-25 Joel Sherrill <joel.sherrilL@OARcorp.com> (diff) | |
| download | rtems-642c500988acf2a5adf9270ffd7416dbcba9e6c0.tar.bz2 | |
2010-04-25 Joel Sherrill <joel.sherrilL@OARcorp.com>
* libchip/serial/mc68681.c, libchip/serial/mc68681_reg.c,
libchip/serial/ns16550.c, libchip/serial/serial.h,
libchip/serial/z85c30.c, libchip/serial/z85c30_reg.c: Use uintptr_t
or intptr_t instead of uint32_t or int32_t.
Diffstat (limited to 'c/src/libchip/serial/ns16550.c')
| -rw-r--r-- | c/src/libchip/serial/ns16550.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/c/src/libchip/serial/ns16550.c b/c/src/libchip/serial/ns16550.c index 37a24e1bc6..11e33f8915 100644 --- a/c/src/libchip/serial/ns16550.c +++ b/c/src/libchip/serial/ns16550.c @@ -95,7 +95,7 @@ console_fns ns16550_fns_polled = { NS16550_STATIC void ns16550_init(int minor) { - uint32_t pNS16550; + uintptr_t pNS16550; uint8_t ucTrash; uint8_t ucDataByte; uint32_t ulBaudDivisor; @@ -129,7 +129,7 @@ NS16550_STATIC void ns16550_init(int minor) ulBaudDivisor = NS16550_Baud( (uint32_t) Console_Port_Tbl[minor].ulClock, - (uint32_t) Console_Port_Tbl[minor].pDeviceParams + (uint32_t) ((uintptr_t)Console_Port_Tbl[minor].pDeviceParams) ); ucDataByte = SP_LINE_DLAB; (*setReg)(pNS16550, NS16550_LINE_CONTROL, ucDataByte); @@ -183,7 +183,7 @@ NS16550_STATIC int ns16550_open( } /* Set initial baud */ - rtems_termios_set_initial_baud( tty, (int32_t) c->pDeviceParams); + rtems_termios_set_initial_baud( tty, (intptr_t) c->pDeviceParams); if (c->pDeviceFns->deviceOutputUsesInterrupts) { ns16550_enable_interrupts( minor, NS16550_ENABLE_ALL_INTR_EXCEPT_TX); @@ -217,10 +217,10 @@ NS16550_STATIC int ns16550_close( /** * @brief Polled write for NS16550. */ -NS16550_STATIC void ns16550_write_polled( int minor, char out) +NS16550_STATIC void ns16550_write_polled(int minor, char out) { console_tbl *c = &Console_Port_Tbl [minor]; - uint32_t port = c->ulCtrlPort1; + uintptr_t port = c->ulCtrlPort1; getRegister_f get = c->getRegister; setRegister_f set = c->setRegister; uint32_t status = 0; |