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

2004-07-30 Jay Monkman <jtm@lopingdog.com>

Browse Source 
* network/network.c: Changes to network driver to get it to compile
	again.
This commit is contained in:
Jay Monkman
2004-07-30 06:14:33 +00:00
parent 15fcc0bc68
commit 2ee764d6cc
2 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libbsp/arm/edb7312/ChangeLog
View File

@@ -1,3 +1,8 @@
2004-07-30 Jay Monkman <jtm@lopingdog.com>
* network/network.c: Changes to network driver to get it to compile
again.
2004-04-23 Ralf Corsepius <ralf_corsepius@rtems.org> 2004-04-23 Ralf Corsepius <ralf_corsepius@rtems.org>
PR 610/bsps PR 610/bsps

32
c/src/lib/libbsp/arm/edb7312/network/network.c
View File

@@ -24,7 +24,7 @@ rtems_isr cs8900_isr(rtems_vector_number v)
} }
/* cs8900_io_set_reg - set one of the I/O addressed registers */ /* cs8900_io_set_reg - set one of the I/O addressed registers */
void cs8900_io_set_reg (int dev, unsigned short reg, unsigned short data) void cs8900_io_set_reg (cs8900_device *cs, unsigned short reg, unsigned short data)
{ {
/* works the same for all values of dev */ /* works the same for all values of dev */
/* /*
@@ -36,7 +36,7 @@ void cs8900_io_set_reg (int dev, unsigned short reg, unsigned short data)
} }
/* cs8900_io_get_reg - reads one of the I/O addressed registers */ /* cs8900_io_get_reg - reads one of the I/O addressed registers */
unsigned short cs8900_io_get_reg (int dev, unsigned short reg) unsigned short cs8900_io_get_reg (cs8900_device *cs, unsigned short reg)
{ {
unsigned short val; unsigned short val;
/* works the same for all values of dev */ /* works the same for all values of dev */
@@ -50,24 +50,24 @@ unsigned short cs8900_io_get_reg (int dev, unsigned short reg)
/* cs8900_mem_set_reg - sets one of the registers mapped through /* cs8900_mem_set_reg - sets one of the registers mapped through
* PacketPage * PacketPage
*/ */
void cs8900_mem_set_reg (int dev, unsigned long reg, unsigned short data) void cs8900_mem_set_reg (cs8900_device *cs, unsigned long reg, unsigned short data)
{ {
/* works the same for all values of dev */ /* works the same for all values of dev */
cs8900_io_set_reg(dev, CS8900_IO_PACKET_PAGE_PTR, reg); cs8900_io_set_reg(cs, CS8900_IO_PACKET_PAGE_PTR, reg);
cs8900_io_set_reg(dev, CS8900_IO_PP_DATA_PORT0, data); cs8900_io_set_reg(cs, CS8900_IO_PP_DATA_PORT0, data);
} }
/* cs8900_mem_get_reg - reads one of the registers mapped through /* cs8900_mem_get_reg - reads one of the registers mapped through
* PacketPage * PacketPage
*/ */
unsigned short cs8900_mem_get_reg (int dev, unsigned long reg) unsigned short cs8900_mem_get_reg (cs8900_device *cs, unsigned long reg)
{ {
/* works the same for all values of dev */ /* works the same for all values of dev */
cs8900_io_set_reg(dev, CS8900_IO_PACKET_PAGE_PTR, reg); cs8900_io_set_reg(cs, CS8900_IO_PACKET_PAGE_PTR, reg);
return cs8900_io_get_reg(dev, CS8900_IO_PP_DATA_PORT0); return cs8900_io_get_reg(cs, CS8900_IO_PP_DATA_PORT0);
} }
void cs8900_get_mac_addr (int dev, unsigned char *mac_address) void cs8900_get_mac_addr (cs8900_device *cs, unsigned char *mac_address)
{ {
mac_address[0] = 0x08; mac_address[0] = 0x08;
mac_address[1] = 0x00; mac_address[1] = 0x00;
@@ -77,32 +77,32 @@ void cs8900_get_mac_addr (int dev, unsigned char *mac_address)
mac_address[5] = 0xf7; mac_address[5] = 0xf7;
} }
void cs8900_attach_interrupt (int dev, cs8900_device *cs) void cs8900_attach_interrupt (cs8900_device *cs)
{ {
g_cs = cs; g_cs = cs;
BSP_install_rtems_irq_handler(&cs8900_isr_data); BSP_install_rtems_irq_handler(&cs8900_isr_data);
} }
void cs8900_detach_interrupt (int dev) void cs8900_detach_interrupt (cs8900_device *cs)
{ {
BSP_remove_rtems_irq_handler(&cs8900_isr_data); BSP_remove_rtems_irq_handler(&cs8900_isr_data);
} }
unsigned short cs8900_get_data_block (int dev, unsigned char *data) unsigned short cs8900_get_data_block (cs8900_device *cs, unsigned char *data)
{ {
int len; int len;
int i; int i;
len = cs8900_mem_get_reg(dev, CS8900_PP_RxLength); len = cs8900_mem_get_reg(cs, CS8900_PP_RxLength);
for (i = 0; i < ((len + 1) / 2); i++) { for (i = 0; i < ((len + 1) / 2); i++) {
((short *)data)[i] = cs8900_io_get_reg(dev, ((short *)data)[i] = cs8900_io_get_reg(cs,
CS8900_IO_RX_TX_DATA_PORT0); CS8900_IO_RX_TX_DATA_PORT0);
} }
return len; return len;
} }
void cs8900_tx_load (int dev, struct mbuf *m) void cs8900_tx_load (cs8900_device *cs, struct mbuf *m)
{ {
int len; int len;
short *data; short *data;
@@ -118,7 +118,7 @@ void cs8900_tx_load (int dev, struct mbuf *m)
data = (unsigned short *) &g_enetbuf[0]; data = (unsigned short *) &g_enetbuf[0];
for (i = 0; i < ((len + 1) / 2); i++) { for (i = 0; i < ((len + 1) / 2); i++) {
cs8900_io_set_reg(dev, cs8900_io_set_reg(cs,
CS8900_IO_RX_TX_DATA_PORT0, CS8900_IO_RX_TX_DATA_PORT0,
data[i]); data[i]);
} }