From 2afd852a7c8c0a35838ce9b399af7c610bdca939 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 3 May 2005 18:48:32 +0000 Subject: 2005-05-03 Joel Sherrill * sh7045/sci/sci.c, sh7045/sci/sci_termios.c: Remove warnings. --- c/src/lib/libcpu/sh/ChangeLog | 4 + c/src/lib/libcpu/sh/sh7045/sci/sci.c | 116 +++++++++++++-------------- c/src/lib/libcpu/sh/sh7045/sci/sci_termios.c | 104 ++++++++++-------------- 3 files changed, 106 insertions(+), 118 deletions(-) (limited to 'c/src') diff --git a/c/src/lib/libcpu/sh/ChangeLog b/c/src/lib/libcpu/sh/ChangeLog index 0edba997fb..661315493e 100644 --- a/c/src/lib/libcpu/sh/ChangeLog +++ b/c/src/lib/libcpu/sh/ChangeLog @@ -1,3 +1,7 @@ +2005-05-03 Joel Sherrill + + * sh7045/sci/sci.c, sh7045/sci/sci_termios.c: Remove warnings. + 2005-03-14 Joel Sherrill * sh7750/sci/sh4uart.c: Now compiles under gcc 4.x and reformatted. diff --git a/c/src/lib/libcpu/sh/sh7045/sci/sci.c b/c/src/lib/libcpu/sh/sh7045/sci/sci.c index f78f36179d..71241dfe4a 100644 --- a/c/src/lib/libcpu/sh/sh7045/sci/sci.c +++ b/c/src/lib/libcpu/sh/sh7045/sci/sci.c @@ -77,16 +77,16 @@ /* #define SH_SCI_DEF_COMM_1 B9600 | CS8 */ struct scidev_t { - char * name ; - uint32_t addr ; - rtems_device_minor_number minor ; - unsigned short opened ; - tcflag_t cflags ; + char * name; + uint32_t addr; + rtems_device_minor_number minor; + unsigned short opened; + tcflag_t cflags; } sci_device[SCI_MINOR_DEVICES] = { { "/dev/sci0", SH_SCI_BASE_0, 0, 0, SH_SCI_DEF_COMM_0 }, { "/dev/sci1", SH_SCI_BASE_1, 1, 0, SH_SCI_DEF_COMM_1 } -} ; +}; /* local data structures maintain hardware configuration */ #if UNUSED @@ -97,20 +97,22 @@ static sci_setup_t sio_param[2]; extern int _sci_get_brparms( tcflag_t cflag, unsigned char *smr, - unsigned char *brr ); + unsigned char *brr +); /* Translate termios' tcflag_t into sci settings */ static int _sci_set_cflags( - struct scidev_t *sci_dev, - tcflag_t c_cflag ) + struct scidev_t *sci_dev, + tcflag_t c_cflag +) { - uint8_t smr ; - uint8_t brr ; + uint8_t smr; + uint8_t brr; if ( c_cflag & CBAUD ) { if ( _sci_get_brparms( c_cflag, &smr, &brr ) != 0 ) - return -1 ; + return -1; } if ( c_cflag & CSIZE ) @@ -120,7 +122,7 @@ static int _sci_set_cflags( else if ( c_cflag & CS7 ) smr |= SCI_SEVEN_BIT_DATA; else - return -1 ; + return -1; } if ( c_cflag & CSTOPB ) @@ -129,19 +131,19 @@ static int _sci_set_cflags( smr &= ~SCI_STOP_BITS_2; if ( c_cflag & PARENB ) - smr |= SCI_PARITY_ON ; + smr |= SCI_PARITY_ON; else - smr &= ~SCI_PARITY_ON ; + smr &= ~SCI_PARITY_ON; if ( c_cflag & PARODD ) - smr |= SCI_ODD_PARITY ; + smr |= SCI_ODD_PARITY; else smr &= ~SCI_ODD_PARITY; write8( smr, sci_dev->addr + SCI_SMR ); write8( brr, sci_dev->addr + SCI_BRR ); - return 0 ; + return 0; } /* @@ -213,7 +215,7 @@ rtems_boolean rdSCI0(unsigned char *ch) temp = read8(SCI_SSR0) & ~SCI_RDRF; write8(temp, SCI_SSR0); /* Check for transmission errors */ - if(temp & (SCI_ORER | SCI_FER | SCI_PER)){ + if (temp & (SCI_ORER | SCI_FER | SCI_PER)) { /* TODO: report to RTEMS transmission error */ /* clear error flags*/ @@ -237,7 +239,7 @@ rtems_boolean rdSCI1(unsigned char *ch) temp= read8(SCI_SSR1) & ~SCI_RDRF; write8(temp, SCI_SSR1); /* Check for transmission errors */ - if(temp & (SCI_ORER | SCI_FER | SCI_PER)){ + if (temp & (SCI_ORER | SCI_FER | SCI_PER)) { /* TODO: report to RTEMS transmission error */ /* clear error flags*/ @@ -251,26 +253,24 @@ rtems_boolean rdSCI1(unsigned char *ch) /* initial version pulls byte from selected port */ -char sh_sci_inbyte_polled( - rtems_device_minor_number minor ) +char sh_sci_inbyte_polled( rtems_device_minor_number minor ) { - char ch; + uint8_t ch = 0; - if (minor == 0) /* blocks until char.ready */ - while (rdSCI0(&ch) != TRUE); /* SCI0 */ - else - while (rdSCI1(&ch) != TRUE); /* SCI1 */ - return ch; + if (minor == 0) /* blocks until char.ready */ + while (rdSCI0(&ch) != TRUE); /* SCI0 */ + else + while (rdSCI1(&ch) != TRUE); /* SCI1 */ + return ch; } /* sh_sci_inbyte_polled */ /* Initial version calls polled input driver */ -char inbyte( - rtems_device_minor_number minor ) +char inbyte( rtems_device_minor_number minor ) { - char ch; + char ch; - ch = sh_sci_inbyte_polled(minor); - return ch; + ch = sh_sci_inbyte_polled(minor); + return ch; } /* inbyte */ @@ -311,7 +311,7 @@ rtems_device_driver sh_sci_initialize( status = rtems_io_lookup_name( sci_device[i].name, &driver); - if( status != RTEMS_SUCCESSFUL ) + if ( status != RTEMS_SUCCESSFUL ) { /* OK. We assume it is not registered yet. */ status = rtems_io_register_name( @@ -342,10 +342,10 @@ rtems_device_driver sh_sci_open( uint8_t temp8; uint16_t temp16; - unsigned a ; + unsigned a; /* check for valid minor number */ - if(( minor > ( SCI_MINOR_DEVICES -1 )) || ( minor < 0 )) + if (( minor > ( SCI_MINOR_DEVICES -1 )) || ( minor < 0 )) { return RTEMS_INVALID_NUMBER; } @@ -353,8 +353,8 @@ rtems_device_driver sh_sci_open( /* device already opened */ if ( sci_device[minor].opened > 0 ) { - sci_device[minor].opened++ ; - return RTEMS_SUCCESSFUL ; + sci_device[minor].opened++; + return RTEMS_SUCCESSFUL; } /* set PFC registers to enable I/O pins */ @@ -378,7 +378,7 @@ rtems_device_driver sh_sci_open( /* set SMR and BRR */ _sci_set_cflags( &sci_device[minor], sci_device[minor].cflags ); - for(a=0; a < 10000L; a++) { /* Delay */ + for (a=0; a < 10000L; a++) { /* Delay */ asm volatile ("nop"); } @@ -387,7 +387,7 @@ rtems_device_driver sh_sci_open( /* clear error flags */ temp8 = read8(sci_device[minor].addr + SCI_SSR); - while(temp8 & (SCI_RDRF | SCI_ORER | SCI_FER | SCI_PER)){ + while (temp8 & (SCI_RDRF | SCI_ORER | SCI_FER | SCI_PER)) { temp8 = read8(sci_device[minor].addr + SCI_RDR); /* flush input */ temp8 = read8(sci_device[minor].addr + SCI_SSR); /* clear some flags */ write8(temp8 & ~(SCI_RDRF | SCI_ORER | SCI_FER | SCI_PER), @@ -403,9 +403,9 @@ rtems_device_driver sh_sci_open( /* add interrupt setup if required */ - sci_device[minor].opened++ ; + sci_device[minor].opened++; - return RTEMS_SUCCESSFUL ; + return RTEMS_SUCCESSFUL; } /* @@ -420,11 +420,11 @@ rtems_device_driver sh_sci_close( { /* FIXME: Incomplete */ if ( sci_device[minor].opened > 0 ) - sci_device[minor].opened-- ; + sci_device[minor].opened--; else - return RTEMS_INVALID_NUMBER ; + return RTEMS_INVALID_NUMBER; - return RTEMS_SUCCESSFUL ; + return RTEMS_SUCCESSFUL; } /* @@ -501,7 +501,7 @@ rtems_device_driver sh_sci_control( ) { /* Not yet supported */ - return RTEMS_SUCCESSFUL ; + return RTEMS_SUCCESSFUL; } /* @@ -525,27 +525,27 @@ static int _sh_sci_last_close(int major, int minor, void *arg) */ static int _sh_sci_poll_read(int minor) { - int value = -1; - char ch; - - if( minor == 0 ){ - if( rdSCI0( &ch ) ) - value = (int) ch; - }else if( minor == 1 ){ - if( rdSCI1( &ch ) ) - value = (int) ch; - } - return value; + int value = -1; + uint8_t ch = 0; + + if ( minor == 0 ) { + if ( rdSCI0( &ch ) ) + value = (int) ch; + } else if ( minor == 1 ) { + if ( rdSCI1( &ch ) ) + value = (int) ch; + } + return value; } /* * Termios polled write */ -static int _sh_sci_poll_write(int minor, const char *buf, int len) +static int _sh_sci_poll_write(int minor, const uint8_t *buf, int len) { int count; - for(count = 0; count < len; count++) + for (count = 0; count < len; count++) outbyte( minor, buf[count] ); return count; } diff --git a/c/src/lib/libcpu/sh/sh7045/sci/sci_termios.c b/c/src/lib/libcpu/sh/sh7045/sci/sci_termios.c index ef9e510f66..5cd57b2bf7 100644 --- a/c/src/lib/libcpu/sh/sh7045/sci/sci_termios.c +++ b/c/src/lib/libcpu/sh/sh7045/sci/sci_termios.c @@ -61,7 +61,8 @@ extern int _sci_get_brparms( tcflag_t cflag, unsigned char *smr, - unsigned char *brr ); + unsigned char *brr +); /* * Translate termios flags into SCI settings @@ -71,20 +72,18 @@ int sh_sci_set_attributes( const struct termios *t ) { - uint8_t smr ; - uint8_t brr ; + uint8_t smr; + uint8_t brr; int a; tcflag_t c_cflag = t->c_cflag; - if ( c_cflag & CBAUD ) - { + if ( c_cflag & CBAUD ) { if ( _sci_get_brparms( c_cflag, &smr, &brr ) != 0 ) return -1 ; } - if ( c_cflag & CSIZE ) - { + if ( c_cflag & CSIZE ) { if ( c_cflag & CS8 ) smr &= ~SCI_SEVEN_BIT_DATA; else if ( c_cflag & CS7 ) @@ -113,7 +112,7 @@ int sh_sci_set_attributes( SH_SCI_REG_DATA(smr, minor, SCI_SMR); SH_SCI_REG_DATA(brr, minor, SCI_BRR); - for(a=0; a < 10000L; a++) { /* Delay one bit */ + for (a=0; a < 10000L; a++) { /* Delay one bit */ asm volatile ("nop"); } @@ -131,11 +130,9 @@ rtems_isr sh_sci_rx_isr(rtems_vector_number vector) { int minor; - for(minor = 0; minor < Console_Port_Count; minor++) - { - if(Console_Port_Tbl[minor].ulIntVector == vector) - { - uint8_t temp8; + for (minor = 0; minor < Console_Port_Count; minor++) { + if (Console_Port_Tbl[minor].ulIntVector == vector) { + char temp8; /* * FIXME: error handling should be added @@ -143,8 +140,7 @@ rtems_isr sh_sci_rx_isr(rtems_vector_number vector) temp8 = read8(Console_Port_Tbl[minor].ulCtrlPort1 + SCI_RDR); rtems_termios_enqueue_raw_characters( - Console_Port_Data[minor].termios_data, - (char*)&temp8, 1); + Console_Port_Data[minor].termios_data, &temp8, 1); SH_SCI_REG_MASK(SCI_RDRF, minor, SCI_SSR); break; @@ -161,10 +157,8 @@ rtems_isr sh_sci_tx_isr(rtems_vector_number vector) { int minor; - for(minor = 0; minor < Console_Port_Count; minor++) - { - if(Console_Port_Tbl[minor].ulDataPort == vector) - { + for (minor = 0; minor < Console_Port_Count; minor++) { + if (Console_Port_Tbl[minor].ulDataPort == vector) { /* * FIXME: Error handling should be added */ @@ -174,9 +168,8 @@ rtems_isr sh_sci_tx_isr(rtems_vector_number vector) */ SH_SCI_REG_MASK(SCI_TIE, minor, SCI_SCR); - if(rtems_termios_dequeue_characters( - Console_Port_Data[minor].termios_data, 1)) - { + if (rtems_termios_dequeue_characters( + Console_Port_Data[minor].termios_data, 1)) { /* * More characters to be received - interrupt must be enabled */ @@ -198,16 +191,13 @@ void sh_sci_init(int minor) /* * set PFC registers to enable I/O pins */ - if ((minor == 0)) - { + if ((minor == 0)) { temp16 = read16(PFC_PACRL2); /* disable SCK0, DMA, IRQ */ temp16 &= ~(PA2MD1 | PA2MD0); temp16 |= (PA_TXD0 | PA_RXD0); /* enable pins for Tx0, Rx0 */ write16(temp16, PFC_PACRL2); - } - else if (minor == 1) - { + } else if (minor == 1) { temp16 = read16(PFC_PACRL2); /* disable SCK1, DMA, IRQ */ temp16 &= ~(PA5MD1 | PA5MD0); temp16 |= (PA_TXD1 | PA_RXD1); /* enable pins for Tx1, Rx1 */ @@ -234,10 +224,9 @@ void sh_sci_initialize_interrupts(int minor) /* * Disable IRQ of SCIx */ - status = sh_set_irq_priority( - Console_Port_Tbl[minor].ulIntVector, 0); + status = sh_set_irq_priority( Console_Port_Tbl[minor].ulIntVector, 0); - if(status != RTEMS_SUCCESSFUL) + if (status != RTEMS_SUCCESSFUL) rtems_fatal_error_occurred(status); SH_SCI_REG_MASK(SCI_RIE, minor, SCI_SCR); @@ -250,7 +239,7 @@ void sh_sci_initialize_interrupts(int minor) Console_Port_Tbl[minor].ulIntVector, &old_isr); - if(status != RTEMS_SUCCESSFUL) + if (status != RTEMS_SUCCESSFUL) rtems_fatal_error_occurred(status); status = rtems_interrupt_catch( @@ -258,7 +247,7 @@ void sh_sci_initialize_interrupts(int minor) Console_Port_Tbl[minor].ulDataPort, &old_isr); - if(status != RTEMS_SUCCESSFUL) + if (status != RTEMS_SUCCESSFUL) rtems_fatal_error_occurred(status); /* @@ -270,7 +259,7 @@ void sh_sci_initialize_interrupts(int minor) Console_Port_Tbl[minor].ulIntVector, Console_Port_Tbl[minor].ulCtrlPort2); - if(status != RTEMS_SUCCESSFUL) + if (status != RTEMS_SUCCESSFUL) rtems_fatal_error_occurred(status); } @@ -283,16 +272,16 @@ void sh_sci_initialize_interrupts(int minor) int sh_sci_first_open( int major, int minor, - void *arg ) + void *arg +) { - uint8_t temp8; + char temp8; unsigned int a ; /* * check for valid minor number */ - if(( minor > ( SCI_MINOR_DEVICES -1 )) || ( minor < 0 )) - { + if (( minor > ( SCI_MINOR_DEVICES -1 )) || ( minor < 0 )) { return RTEMS_INVALID_NUMBER; } @@ -305,7 +294,7 @@ int sh_sci_first_open( /* set SMR and BRR - baudrate and format */ sh_sci_set_attributes(minor, Console_Port_Tbl[minor].pDeviceParams); - for(a=0; a < 10000L; a++) { /* Delay */ + for (a=0; a < 10000L; a++) { /* Delay */ asm volatile ("nop"); } @@ -316,8 +305,7 @@ int sh_sci_first_open( * clear error flags */ temp8 = read8(Console_Port_Tbl[minor].ulCtrlPort1 + SCI_SSR); - while(temp8 & (SCI_RDRF | SCI_ORER | SCI_FER | SCI_PER)) - { + while(temp8 & (SCI_RDRF | SCI_ORER | SCI_FER | SCI_PER)) { /* flush input */ temp8 = read8(Console_Port_Tbl[minor].ulCtrlPort1 + SCI_RDR); @@ -337,8 +325,7 @@ int sh_sci_first_open( /* * Interrupt setup */ - if(Console_Port_Tbl[minor].pDeviceFns->deviceOutputUsesInterrupts) - { + if (Console_Port_Tbl[minor].pDeviceFns->deviceOutputUsesInterrupts) { SH_SCI_REG_FLAG(SCI_RIE, minor, SCI_SCR); } @@ -358,7 +345,7 @@ int sh_sci_last_close( /* FIXME: Incomplete */ /* Shutdown interrupts if necessary */ - if(Console_Port_Tbl[minor].pDeviceFns->deviceOutputUsesInterrupts) + if (Console_Port_Tbl[minor].pDeviceFns->deviceOutputUsesInterrupts) { SH_SCI_REG_MASK((SCI_TIE | SCI_RIE), minor, SCI_SCR); } @@ -369,12 +356,12 @@ int sh_sci_last_close( * Interrupt aware write routine */ int sh_sci_write_support_int( - int minor, - const char *buf, - int len + int minor, + const char *buf, + int len ) { - if(!len) + if (!len) return 0; /* * Put data into TDR and clear transmission-end-flag @@ -393,15 +380,14 @@ int sh_sci_write_support_int( * Polled write method */ int sh_sci_write_support_polled( - int minor, - const char *buf, - int len + int minor, + const char *buf, + int len ) { int count = 0; - while(count < len) - { + while(count < len) { sh_sci_write_polled(minor, buf[count]); count++; } @@ -415,8 +401,8 @@ int sh_sci_write_support_polled( * Polled write of one character at a time */ void sh_sci_write_polled( - int minor, - char c + int minor, + char c ) { /* @@ -439,22 +425,20 @@ void sh_sci_write_polled( */ int sh_sci_inbyte_nonblocking_polled(int minor) { - uint8_t inbyte; + char inbyte; /* * Check if input buffer is full */ - if(read8(Console_Port_Tbl[minor].ulCtrlPort1 + SCI_SSR) & SCI_RDRF) - { + if (read8(Console_Port_Tbl[minor].ulCtrlPort1 + SCI_SSR) & SCI_RDRF) { inbyte = read8(Console_Port_Tbl[minor].ulCtrlPort1 + SCI_RDR); SH_SCI_REG_MASK(SCI_RDRF, minor, SCI_SSR); /* * Check for errors */ - if(read8(Console_Port_Tbl[minor].ulCtrlPort1 + SCI_SSR) & - (SCI_ORER | SCI_FER | SCI_PER)) - { + if (read8(Console_Port_Tbl[minor].ulCtrlPort1 + SCI_SSR) & + (SCI_ORER | SCI_FER | SCI_PER)) { SH_SCI_REG_MASK((SCI_ORER | SCI_FER | SCI_PER), minor, SCI_SSR); return -1; } -- cgit v1.2.3