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

2005-04-26 Joel Sherrill <joel@OARcorp.com>

Browse Source 
* 3c509/3c509.c, wd8003/wd8003.c: Eliminate warnings.
This commit is contained in:
Joel Sherrill
2005-04-26 23:03:51 +00:00
parent 17a5e1d8f4
commit b607d9c89a
3 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
c/src/lib/libbsp/i386/pc386/3c509/3c509.c
View File

@@ -58,6 +58,12 @@
*
* MODIFICATION/HISTORY:
* $Log$
* Revision 1.5 2004/07/25 14:21:43 joel
* 2004-07-25 Joel Sherrill <joel@OARcorp.com>
*
* * 3c509/3c509.c: Add <sys/errno.h>.
* * startup/linkcmds: Add .jcr section.
*
* Revision 1.4 2004/04/21 16:01:33 ralf
* Remove duplicate white lines.
*
@@ -242,7 +248,7 @@ extern void Wait_X_ms( unsigned int timeToWait ); /* timer.c ??? */
* RETURNS: nothing.
*
**********************************************************************************/
static __inline void outsl( unsigned short io_addr, unsigned char *out_data, int len )
static __inline void outsl( unsigned short io_addr, uint8_t *out_data, int len )
{
u_long *pl = ( u_long *)out_data;
while( len-- )
@@ -260,7 +266,7 @@ static __inline void outsl( unsigned short io_addr, unsigned char *out_data, int
* RETURNS:
*
**********************************************************************************/
static __inline void outsw( unsigned short io_addr, unsigned char *out_data, int len )
static __inline void outsw( unsigned short io_addr, uint8_t *out_data, int len )
{
u_short *ps = ( u_short *)out_data;
while( len-- )
@@ -278,7 +284,7 @@ static __inline void outsw( unsigned short io_addr, unsigned char *out_data, int
* RETURNS: nothing
*
**********************************************************************************/
static __inline void outsb( unsigned short io_addr, unsigned char *out_data, int len )
static __inline void outsb( unsigned short io_addr, uint8_t *out_data, int len )
{
while( len-- )
{
@@ -295,7 +301,7 @@ static __inline void outsb( unsigned short io_addr, unsigned char *out_data, int
* RETURNS: nothing.
*
**********************************************************************************/
static __inline void insw( unsigned short io_addr, unsigned char *in_data, int len )
static __inline void insw( unsigned short io_addr, uint8_t *in_data, int len )
{
u_short *ps = ( u_short *)in_data;
while( len-- )
@@ -313,7 +319,7 @@ static __inline void insw( unsigned short io_addr, unsigned char *in_data, int l
* RETURNS: nothing.
*
**********************************************************************************/
static __inline void insl( unsigned short io_addr, unsigned char *in_data, int len )
static __inline void insl( unsigned short io_addr, uint8_t *in_data, int len )
{
u_long *pl = ( u_long *)in_data;
while( len-- )
@@ -331,7 +337,7 @@ static __inline void insl( unsigned short io_addr, unsigned char *in_data, int l
* RETURNS: nothing.
*
**********************************************************************************/
static __inline void insb( unsigned short io_addr, unsigned char *in_data, int len )
static __inline void insb( unsigned short io_addr, uint8_t *in_data, int len )
{
while( len-- )
{
@@ -375,7 +381,7 @@ static __inline unsigned short inw( unsigned short io_addr )
* RETURNS: nothing.
*
**********************************************************************************/
void __inline outb( unsigned short io_addr, unsigned char out_data )
void __inline outb( unsigned short io_addr, uint8_t out_data )
{
outport_byte( io_addr, out_data );
}
@@ -387,9 +393,9 @@ void __inline outb( unsigned short io_addr, unsigned char out_data )
* RETURNS: byte read.
*
**********************************************************************************/
static __inline unsigned char inb( unsigned short io_addr )
static __inline uint8_t inb( unsigned short io_addr )
{
unsigned char in_data;
uint8_t in_data;
inport_byte( io_addr, in_data );
return in_data;
}
@@ -1329,15 +1335,15 @@ startagain:
{
if( ep_ftst(F_ACCESS_32_BITS ) )
{
outsl( BASE + EP_W1_TX_PIO_WR_1, mtod(m, caddr_t), m->m_len / 4 );
outsl( BASE + EP_W1_TX_PIO_WR_1, mtod(m, uint8_t *), m->m_len / 4 );
if( m->m_len & 3 )
outsb(BASE + EP_W1_TX_PIO_WR_1, mtod(m, caddr_t) + (m->m_len & (~3)), m->m_len & 3 );
outsb(BASE + EP_W1_TX_PIO_WR_1, mtod(m, uint8_t *) + (m->m_len & (~3)), m->m_len & 3 );
}
else
{
outsw( BASE + EP_W1_TX_PIO_WR_1, mtod(m, caddr_t), m->m_len / 2 );
outsw( BASE + EP_W1_TX_PIO_WR_1, mtod(m, uint8_t *), m->m_len / 2 );
if( m->m_len & 1 )
outb( BASE + EP_W1_TX_PIO_WR_1, *(mtod(m, caddr_t) + m->m_len - 1) );
outb( BASE + EP_W1_TX_PIO_WR_1, *(mtod(m, uint8_t *) + m->m_len - 1) );
}
}
while( pad-- )
@@ -1423,7 +1429,7 @@ read_again:
top->m_data += EOFF;
/* Read what should be the header. */
insw(BASE + EP_W1_RX_PIO_RD_1, mtod(top, caddr_t), sizeof(struct ether_header) / 2);
insw(BASE + EP_W1_RX_PIO_RD_1, mtod(top, uint8_t *), sizeof(struct ether_header) / 2);
top->m_len = sizeof(struct ether_header);
rx_fifo -= sizeof(struct ether_header);
sc->cur_len = rx_fifo2;
@@ -1454,18 +1460,18 @@ read_again:
}
if( ep_ftst( F_ACCESS_32_BITS ) )
{ /* default for EISA configured cards*/
insl( BASE + EP_W1_RX_PIO_RD_1, mtod(m, caddr_t) + m->m_len, lenthisone / 4);
insl( BASE + EP_W1_RX_PIO_RD_1, mtod(m, uint8_t *) + m->m_len, lenthisone / 4);
m->m_len += (lenthisone & ~3);
if (lenthisone & 3)
insb(BASE + EP_W1_RX_PIO_RD_1, mtod(m, caddr_t) + m->m_len, lenthisone & 3);
insb(BASE + EP_W1_RX_PIO_RD_1, mtod(m, uint8_t *) + m->m_len, lenthisone & 3);
m->m_len += (lenthisone & 3);
}
else
{
insw(BASE + EP_W1_RX_PIO_RD_1, mtod(m, caddr_t) + m->m_len, lenthisone / 2);
insw(BASE + EP_W1_RX_PIO_RD_1, mtod(m, uint8_t *) + m->m_len, lenthisone / 2);
m->m_len += lenthisone;
if( lenthisone & 1 )
*(mtod(m, caddr_t) + m->m_len - 1) = inb(BASE + EP_W1_RX_PIO_RD_1);
*(mtod(m, uint8_t *) + m->m_len - 1) = inb(BASE + EP_W1_RX_PIO_RD_1);
}
rx_fifo -= lenthisone;
}

4
c/src/lib/libbsp/i386/pc386/ChangeLog
View File

@@ -1,3 +1,7 @@
2005-04-26 Joel Sherrill <joel@OARcorp.com>
* 3c509/3c509.c, wd8003/wd8003.c: Eliminate warnings.
2005-04-18 Eric Valette <eric.valette@free.fr>
* clock/ckinit.c, console/console.c, console/ps2_mouse.c,

4
c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c
View File

@@ -323,7 +323,7 @@ wd_rxDaemon (void *arg)
MCLGET (m, M_WAIT);
m->m_pkthdr.rcvif = ifp;
temp = m->m_data;
temp = (unsigned char *) m->m_data;
m->m_len = m->m_pkthdr.len = len - sizeof(struct ether_header);
if ((i2 = (OUTPAGE - start) * SHAPAGE - 4) < len){
@@ -363,7 +363,7 @@ sendpacket (struct ifnet *ifp, struct mbuf *m)
struct wd_softc *dp = ifp->if_softc;
struct mbuf *n;
unsigned int len, tport;
char *shp, txReady;
uint8_t *shp, txReady;
tport = dp->port;