Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-05 15:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

2004-03-31 Ralf Corsepius <ralf_corsepius@rtems.org>

Browse Source 
* console/console.c, include/bsp.h, irq/irq.c, network/network.c,
	startup/bspstart.c: Convert to using c99 fixed size types.
This commit is contained in:
Ralf Corsepius
2004-03-31 03:47:26 +00:00
parent dac42086c9
commit 2a832d84ce
6 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
View File

@@ -1,3 +1,8 @@
2004-03-31 Ralf Corsepius <ralf_corsepius@rtems.org>
* console/console.c, include/bsp.h, irq/irq.c, network/network.c,
startup/bspstart.c: Convert to using c99 fixed size types.
2004-03-03 Joel Sherrill <joel@OARcorp.com> 2004-03-03 Joel Sherrill <joel@OARcorp.com>
* irq/irq.h: Correct typo. * irq/irq.h: Correct typo.

4
c/src/lib/libbsp/powerpc/mpc8260ads/console/console.c
View File

@@ -139,7 +139,7 @@ static rtems_status_code do_poll_read(
#define BSP_READ m8xx_uart_pollRead #define BSP_READ m8xx_uart_pollRead
while( (c = BSP_READ(minor)) == -1 ); while( (c = BSP_READ(minor)) == -1 );
rw_args->buffer[0] = (unsigned8)c; rw_args->buffer[0] = (uint8_t)c;
if( rw_args->buffer[0] == '\r' ) if( rw_args->buffer[0] == '\r' )
rw_args->buffer[0] = '\n'; rw_args->buffer[0] = '\n';
rw_args->bytes_moved = 1; rw_args->bytes_moved = 1;
@@ -175,7 +175,7 @@ static rtems_status_code do_poll_write(
) )
{ {
rtems_libio_rw_args_t *rw_args = arg; rtems_libio_rw_args_t *rw_args = arg;
unsigned32 i; uint32_t i;
char cr ='\r'; char cr ='\r';
#define BSP_WRITE m8xx_uart_pollWrite #define BSP_WRITE m8xx_uart_pollWrite

10
c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h
View File

@@ -39,10 +39,10 @@ extern "C" {
typedef struct bcsr typedef struct bcsr
{ {
rtems_unsigned32 bcsr0; /* Board Control and Status Register */ uint32_t bcsr0; /* Board Control and Status Register */
rtems_unsigned32 bcsr1; uint32_t bcsr1;
rtems_unsigned32 bcsr2; uint32_t bcsr2;
rtems_unsigned32 bcsr3; uint32_t bcsr3;
} BCSR; } BCSR;
@@ -139,7 +139,7 @@ extern rtems_configuration_table BSP_Configuration;
void bsp_cleanup( void ); void bsp_cleanup( void );
#if 0 #if 0
void M8260ExecuteRISC( rtems_unsigned32 command ); void M8260ExecuteRISC( uint32_t command );
void *M8260AllocateBufferDescriptors( int count ); void *M8260AllocateBufferDescriptors( int count );
void *M8260AllocateRiscTimers( int count ); void *M8260AllocateRiscTimers( int count );
extern char M8260DefaultWatchdogFeeder; extern char M8260DefaultWatchdogFeeder;

8
c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c
View File

@@ -60,10 +60,10 @@ static inline int is_processor_irq(const rtems_irq_symbolic_name irqLine)
} }
typedef struct { typedef struct {
rtems_unsigned32 mask_h; /* mask for sipnr_h and simr_h */ uint32_t mask_h; /* mask for sipnr_h and simr_h */
rtems_unsigned32 mask_l; /* mask for sipnr_l and simr_l */ uint32_t mask_l; /* mask for sipnr_l and simr_l */
rtems_unsigned32 priority_h; /* mask this and lower priority ints */ uint32_t priority_h; /* mask this and lower priority ints */
rtems_unsigned32 priority_l; uint32_t priority_l;
} m82xxIrqMasks_t; } m82xxIrqMasks_t;
/* /*

8
c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c
View File

@@ -390,7 +390,7 @@ m8260_scc_initialize_hardware (struct m8260_hdlc_struct *sc)
static void static void
m8260Enet_retire_tx_bd (struct m8260_hdlc_struct *sc) m8260Enet_retire_tx_bd (struct m8260_hdlc_struct *sc)
{ {
rtems_unsigned16 status; uint16_t status;
int i; int i;
int nRetired; int nRetired;
struct mbuf *m, *n; struct mbuf *m, *n;
@@ -448,7 +448,7 @@ scc_rxDaemon (void *arg)
struct m8260_hdlc_struct *sc = (struct m8260_hdlc_struct *)arg; struct m8260_hdlc_struct *sc = (struct m8260_hdlc_struct *)arg;
struct ifnet *ifp = &sc->ac_if; struct ifnet *ifp = &sc->ac_if;
struct mbuf *m; struct mbuf *m;
rtems_unsigned16 status; uint16_t status;
m8260BufferDescriptor_t *rxBd; m8260BufferDescriptor_t *rxBd;
int rxBdIndex; int rxBdIndex;
@@ -541,7 +541,7 @@ scc_rxDaemon (void *arg)
m = sc->rxMbuf[rxBdIndex]; m = sc->rxMbuf[rxBdIndex];
/* strip off HDLC CRC */ /* strip off HDLC CRC */
m->m_len = m->m_pkthdr.len = rxBd->length - sizeof(rtems_unsigned16); m->m_len = m->m_pkthdr.len = rxBd->length - sizeof(uint16_t);
hdlc_input( ifp, m ); hdlc_input( ifp, m );
@@ -599,7 +599,7 @@ scc_sendpacket (struct ifnet *ifp, struct mbuf *m)
struct m8260_hdlc_struct *sc = ifp->if_softc; struct m8260_hdlc_struct *sc = ifp->if_softc;
volatile m8260BufferDescriptor_t *firstTxBd, *txBd; volatile m8260BufferDescriptor_t *firstTxBd, *txBd;
struct mbuf *l = NULL; struct mbuf *l = NULL;
rtems_unsigned16 status; uint16_t status;
int nAdded; int nAdded;
/* /*

6
c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c
View File

@@ -80,7 +80,7 @@ char *rtems_progname;
* rtems/c/src/lib/libbsp/shared/bsplibc.c. * rtems/c/src/lib/libbsp/shared/bsplibc.c.
*/ */
void bsp_postdriver_hook(void); void bsp_postdriver_hook(void);
void bsp_libc_init( void *, unsigned32, int ); void bsp_libc_init( void *, uint32_t, int );
void _BSP_GPLED1_on(void); void _BSP_GPLED1_on(void);
void _BSP_GPLED0_on(void); void _BSP_GPLED0_on(void);
@@ -328,7 +328,7 @@ void bsp_start(void)
/* use BRG1 to generate 32kHz timebase */ /* use BRG1 to generate 32kHz timebase */
/* /*
m8260.brgc1 = M8260_BRG_EN + (unsigned32)(((unsigned16)((40016384)/(32768)) - 1) << 1) + 0; m8260.brgc1 = M8260_BRG_EN + (uint32_t)(((uint16_t)((40016384)/(32768)) - 1) << 1) + 0;
*/ */
@@ -363,7 +363,7 @@ void bsp_start(void)
* *
*/ */
Thread _Thread_Idle_body( Thread _Thread_Idle_body(
unsigned32 ignored ) uint32_t ignored )
{ {
for( ; ; ) for( ; ; )