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

adapted to new prototype for *_write function

Browse Source
This commit is contained in:
Thomas Doerfler
2009-12-17 08:42:17 +00:00
parent dddcb78e00
commit 39a9f8ea12
54 changed files with 298 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
c/src/lib/libcpu/m68k/ChangeLog
View File

@@ -1,3 +1,8 @@
2009-12-16 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
* mcf5206/include/mcfuart.h, mcf5206/include/mcfuart.c: adapted to
new prototype for *_write function
2009-10-15 Thomas Doefler <thomas.doerfler@embedded-brains.de>
* Makefile.am, mcf548x/mcdma/MCD_dma.h, mcf548x/mcdma/MCD_dmaApi.c,
@@ -9,7 +14,7 @@
2009-10-08 Thomas Doefler <thomas.doerfler@embedded-brains.de>
* mcf5282/include/mcf5282.h: add missing (x) params to four
macros, added paranthesis around usage of x in some macros
macros, added paranthesis around usage of x in some macros
2009-09-10 Till Straumann <strauman@slac.stanford.edu>

12
c/src/lib/libcpu/m68k/mcf5206/console/mcfuart.c
View File

@@ -395,15 +395,17 @@ mcfuart_poll_read(mcfuart *uart)
* RETURNS:
* 0
*/
int
mcfuart_poll_write(mcfuart *uart, const char *buf, int len)
ssize_t
mcfuart_poll_write(mcfuart *uart, const char *buf, size_t len)
{
size_t retval = len;
while (len--)
{
while ((*MCF5206E_USR(MBAR, uart->chn) & MCF5206E_USR_TXRDY) == 0);
*MCF5206E_UTB(MBAR, uart->chn) = *buf++;
}
return 0;
return retval;
}
/* mcfuart_interrupt_handler --
@@ -517,8 +519,8 @@ mcfuart_interrupt_handler(rtems_vector_number vec)
* RETURNS:
* 0
*/
int
mcfuart_interrupt_write(mcfuart *uart, const char *buf, int len)
ssize_t
mcfuart_interrupt_write(mcfuart *uart, const char *buf, size_t len)
{
int level;
rtems_interrupt_disable(level);

8
c/src/lib/libcpu/m68k/mcf5206/include/mcfuart.h
View File

@@ -89,14 +89,14 @@ mcfuart_poll_read(mcfuart *uart);
/* mcfuart_interrupt_write --
* This function initiate transmitting of the buffer in interrupt mode.
*/
int
mcfuart_interrupt_write(mcfuart *uart, const char *buf, int len);
ssize_t
mcfuart_interrupt_write(mcfuart *uart, const char *buf, size_t len);
/* mcfuart_poll_write --
* This function transmit buffer byte-by-byte in polling mode.
*/
int
mcfuart_poll_write(mcfuart *uart, const char *buf, int len);
ssize_t
mcfuart_poll_write(mcfuart *uart, const char *buf, size_t len);
/* mcfuart_stop_remote_tx --
* This function stop data flow from remote device.

22
c/src/lib/libcpu/powerpc/ChangeLog
View File

@@ -1,3 +1,17 @@
2009-12-17 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
* mpc5xx/irq/irq.c: removed warning
2009-12-16 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
* mpc5xx/include/console.h,
mpc5xx/console-generic/console-generic.c,
mpc8xx/include/console.h,
mpc8xx/console-generic/console-generic.c,
mpc8260/include/console.h,
mpc8260/console-generic/console-generic.c: adapted to new prototype
for *_write function
2009-12-04 Sebastian Huber <sebastian.huber@embedded-brains.de>
* new-exceptions/bspsupport/ppc_exc_bspsupp.h: Removed file.
@@ -12,7 +26,7 @@
new-exceptions/bspsupport/vectors.h:
Added AltiVec support (save/restore volatile vregs
across exceptions).
2009-12-01 Till Straumann <strauman@slac.stanford.edu>
* Makefile.am, mpc6xx/altivec: new directory implementing
@@ -31,16 +45,16 @@
for firmware I/O.
Added entries for AltiVec on PSIM.
2009-11-15 Till Straumann <strauman@slac.stanford.edu>
* shared/include/cpuIdent.c: Set 604 features + altivec if
running on PSIM.
2009-11-03 Thomas Doerfler <Thomas.Doerfler@imd-systems.de>
* shared/include/powerpc-utility.h, shared/include/byteorder.h,
shared/include/cpuIdent.h:
shared/include/cpuIdent.h:
add c++ declaration brackets
* Makefile.am, mpc8260/clock: removed mpc8260 specific clock
driver

14
c/src/lib/libcpu/powerpc/mpc5xx/console-generic/console-generic.c
View File

@@ -139,11 +139,10 @@ m5xx_uart_pollRead(
return c;
}
int
m5xx_uart_write(
ssize_t m5xx_uart_write(
int minor,
const char *buf,
int len
size_t len
)
{
volatile m5xxSCIRegisters_t *regs = sci_descs[minor].regs;
@@ -153,21 +152,22 @@ m5xx_uart_write(
return 0;
}
int
m5xx_uart_pollWrite(
ssize_t m5xx_uart_pollWrite(
int minor,
const char *buf,
int len
size_t len
)
{
volatile m5xxSCIRegisters_t *regs = sci_descs[minor].regs;
size_t retval = len;
while ( len-- ) {
while ( (regs->scsr & QSMCM_SCI_TDRE) == 0 )
;
regs->scdr = *buf++;
}
return 0;
return retval;
}
int

4
c/src/lib/libcpu/powerpc/mpc5xx/include/console.h
View File

@@ -24,8 +24,8 @@ void m5xx_uart_initialize(int minor);
int m5xx_uart_firstOpen(int maj, int min, void *arg);
int m5xx_uart_lastClose(int maj, int min, void *arg);
int m5xx_uart_pollRead(int minor);
int m5xx_uart_pollWrite(int minor, const char* buf, int len);
int m5xx_uart_write(int minor, const char *buf, int len);
ssize_t m5xx_uart_pollWrite(int minor, const char* buf, size_t len);
ssize_t m5xx_uart_write (int minor, const char *buf, size_t len);
int m5xx_uart_setAttributes(int, const struct termios* t);
#define NUM_PORTS 2 /* number of serial ports */

2
c/src/lib/libcpu/powerpc/mpc5xx/irq/irq.c
View File

@@ -119,7 +119,7 @@ const static unsigned int USIU_IvectMask[CPU_USIU_IRQ_COUNT] =
* is already set and that the tables it contains are still valid
* and accessible.
*/
static void compute_USIU_IvectMask_from_prio ()
static void compute_USIU_IvectMask_from_prio (void)
{
/*
* In theory this is feasible. No time to code it yet. See i386/shared/irq.c

11
c/src/lib/libcpu/powerpc/mpc8260/console-generic/console-generic.c
View File

@@ -1098,11 +1098,11 @@ m8xx_uart_pollRead(
/*
* TODO: Get a free buffer and set it up.
*/
int
ssize_t
m8xx_uart_write(
int minor,
const char *buf,
int len
size_t len
)
{
while( (TxBd[minor]->status) & M8260_BD_READY );
@@ -1115,13 +1115,14 @@ m8xx_uart_write(
}
int
ssize_t
m8xx_uart_pollWrite(
int minor,
const char *buf,
int len
size_t len
)
{
size_t retval = len;
while (len--) {
while (TxBd[minor]->status & M8260_BD_READY)
@@ -1133,5 +1134,5 @@ m8xx_uart_pollWrite(
TxBd[minor]->status = M8260_BD_READY | M8260_BD_WRAP;
}
return 0;
return retval;
}

4
c/src/lib/libcpu/powerpc/mpc8260/include/console.h
View File

@@ -14,8 +14,8 @@ void m8xx_uart_smc_initialize (int minor);
/* Termios callbacks */
int m8xx_uart_pollRead(int minor);
int m8xx_uart_pollWrite(int minor, const char* buf, int len);
int m8xx_uart_write(int minor, const char *buf, int len);
ssize_t m8xx_uart_pollWrite(int minor, const char* buf, size_t len);
ssize_t m8xx_uart_write(int minor, const char *buf, size_t len);
int m8xx_uart_setAttributes(int, const struct termios* t);

10
c/src/lib/libcpu/powerpc/mpc8xx/console-generic/console-generic.c
View File

@@ -1057,11 +1057,11 @@ m8xx_uart_pollRead(
/*
* TODO: Get a free buffer and set it up.
*/
int
ssize_t
m8xx_uart_write(
int minor,
const char *buf,
int len
size_t len
)
{
rtems_cache_flush_multiple_data_lines( buf, len );
@@ -1072,11 +1072,11 @@ m8xx_uart_write(
}
int
ssize_t
m8xx_uart_pollWrite(
int minor,
const char *buf,
int len
size_t len
)
{
while (len--) {
@@ -1088,5 +1088,5 @@ m8xx_uart_pollWrite(
TxBd[minor]->length = 1;
TxBd[minor]->status = M8xx_BD_READY | M8xx_BD_WRAP;
}
return 0;
return len;
}

4
c/src/lib/libcpu/powerpc/mpc8xx/include/console.h
View File

@@ -14,8 +14,8 @@ void m8xx_uart_smc_initialize (int minor);
/* Termios callbacks */
int m8xx_uart_pollRead(int minor);
int m8xx_uart_pollWrite(int minor, const char* buf, int len);
int m8xx_uart_write(int minor, const char *buf, int len);
ssize_t m8xx_uart_pollWrite(int minor, const char* buf, size_t len);
ssize_t m8xx_uart_write(int minor, const char *buf, size_t len);
int m8xx_uart_setAttributes(int, const struct termios* t);