Index: uspace/srv/hw/netif/dp8390/dp8390.c =================================================================== --- uspace/srv/hw/netif/dp8390/dp8390.c (revision fc23ef65a6fb1603dc17d24f990bb9c7df11a5b2) +++ uspace/srv/hw/netif/dp8390/dp8390.c (revision 74864ac490f3a00ce10100d8c028bfb72b246a54) @@ -46,32 +46,22 @@ #define CR_EXTRA CR_STA -_PROTOTYPE(static void dp_init, (dpeth_t *dep) ); -_PROTOTYPE(static void dp_reinit, (dpeth_t *dep) ); -_PROTOTYPE(static void dp_reset, (dpeth_t *dep) ); -_PROTOTYPE(static void dp_recv, (dpeth_t *dep) ); -_PROTOTYPE(static void dp_send, (dpeth_t *dep) ); -_PROTOTYPE(static void dp_pio8_getblock, (dpeth_t *dep, int page, - size_t offset, size_t size, void *dst) ); -_PROTOTYPE(static void dp_pio16_getblock, (dpeth_t *dep, int page, - size_t offset, size_t size, void *dst) ); -_PROTOTYPE(static int dp_pkt2user, (dpeth_t *dep, int page, - int length) ); -_PROTOTYPE(static void dp_pio8_user2nic, (dpeth_t *dep, - iovec_dat_t *iovp, vir_bytes offset, - int nic_addr, vir_bytes count) ); -_PROTOTYPE(static void dp_pio16_user2nic, (dpeth_t *dep, - iovec_dat_t *iovp, vir_bytes offset, - int nic_addr, vir_bytes count) ); -_PROTOTYPE(static void dp_pio8_nic2user, (dpeth_t *dep, int nic_addr, - iovec_dat_t *iovp, vir_bytes offset, vir_bytes count) ); -_PROTOTYPE(static void dp_pio16_nic2user, (dpeth_t *dep, int nic_addr, - iovec_dat_t *iovp, vir_bytes offset, vir_bytes count) ); -_PROTOTYPE(static void dp_next_iovec, (iovec_dat_t *iovp) ); -_PROTOTYPE(static void conf_hw, (dpeth_t *dep) ); -_PROTOTYPE(static void reply, (dpeth_t *dep, int err, int may_block) ); -_PROTOTYPE(static void get_userdata, (int user_proc, - vir_bytes user_addr, vir_bytes count, void *loc_addr) ); -_PROTOTYPE(static void insb, (port_t port, void *buf, size_t size) ); -_PROTOTYPE(static void insw, (port_t port, void *buf, size_t size) ); +static void dp_init(dpeth_t *dep); +static void dp_reinit(dpeth_t *dep); +static void dp_reset(dpeth_t *dep); +static void dp_recv(dpeth_t *dep); +static void dp_send(dpeth_t *dep); +static void dp_pio8_getblock(dpeth_t *dep, int page, size_t offset, size_t size, void *dst); +static void dp_pio16_getblock(dpeth_t *dep, int page, size_t offset, size_t size, void *dst); +static int dp_pkt2user(dpeth_t *dep, int page, int length); +static void dp_pio8_user2nic(dpeth_t *dep, iovec_dat_t *iovp, vir_bytes offset, int nic_addr, vir_bytes count); +static void dp_pio16_user2nic(dpeth_t *dep, iovec_dat_t *iovp, vir_bytes offset, int nic_addr, vir_bytes count); +static void dp_pio8_nic2user(dpeth_t *dep, int nic_addr, iovec_dat_t *iovp, vir_bytes offset, vir_bytes count); +static void dp_pio16_nic2user(dpeth_t *dep, int nic_addr, iovec_dat_t *iovp, vir_bytes offset, vir_bytes count); +static void dp_next_iovec(iovec_dat_t *iovp); +static void conf_hw(dpeth_t *dep); +static void reply(dpeth_t *dep, int err, int may_block); +static void get_userdata(int user_proc, vir_bytes user_addr, vir_bytes count, void *loc_addr); +static void insb(port_t port, void *buf, size_t size); +static void insw(port_t port, void *buf, size_t size); int do_probe(dpeth_t *dep) @@ -226,5 +216,5 @@ count = mp->DL_COUNT; if (port < 0 || port >= DE_PORT_NR) - panic("", "dp8390: illegal port", port); + fprintf(stderr, "dp8390: illegal port\n"); dep= &de_table[port]; dep->de_client= mp->DL_PROC; @@ -233,5 +223,5 @@ assert(!from_int); // dep->de_flags |= DEF_PACK_SEND; - reply(dep, EOK, FALSE); + reply(dep, EOK, false); // return; return EOK; @@ -243,5 +233,5 @@ if ((dep->packet_queue) && (!from_int)) { // if (dep->de_flags &DEF_SEND_AVAIL){ -// panic("", "dp8390: send already in progress", NO_NUM); +// fprintf(stderr, "dp8390: send already in progress\n"); return queue_packet(dep, packet); } @@ -250,8 +240,8 @@ // if (dep->de_sendq[sendq_head].sq_filled) { // if (from_int) -// panic("", "dp8390: should not be sending\n", NO_NUM); +// fprintf(stderr, "dp8390: should not be sending\n"); // dep->de_sendmsg= *mp; // dep->de_flags |= DEF_SEND_AVAIL; -// reply(dep, EOK, FALSE); +// reply(dep, EOK, false); // return; // return queue_packet(dep, packet); @@ -287,5 +277,5 @@ if (size < ETH_MIN_PACK_SIZE || size > ETH_MAX_PACK_SIZE_TAGGED) { - panic("", "dp8390: invalid packet size", size); + fprintf(stderr, "dp8390: invalid packet size\n"); return EINVAL; } @@ -294,5 +284,5 @@ dep->de_sendq[sendq_head].sq_sendpage * DP_PAGESIZE, size); - dep->de_sendq[sendq_head].sq_filled= TRUE; + dep->de_sendq[sendq_head].sq_filled= true; if (dep->de_sendq_tail == sendq_head) { outb_reg0(dep, DP_TPSR, dep->de_sendq[sendq_head].sq_sendpage); @@ -318,5 +308,5 @@ return EOK; - reply(dep, EOK, FALSE); + reply(dep, EOK, false); assert(dep->de_mode == DEM_ENABLED); @@ -499,5 +489,5 @@ if (!(dep->de_flags &DEF_ENABLED)) - panic("", "dp8390: got premature interrupt", NO_NUM); + fprintf(stderr, "dp8390: got premature interrupt\n"); for(;;) @@ -645,7 +635,7 @@ vir_bytes length; int packet_processed, r; - u16_t eth_type; - - packet_processed = FALSE; + uint16_t eth_type; + + packet_processed = false; pageno = inb_reg0(dep, DP_BNRY) + 1; if (pageno == dep->de_stoppage) pageno = dep->de_startpage; @@ -714,5 +704,5 @@ return; - packet_processed = TRUE; + packet_processed = true; dep->de_stat.ets_packetR++; } @@ -741,5 +731,5 @@ packet = dep->packet_queue; dep->packet_queue = pq_detach(packet); - do_pwrite(dep, packet, TRUE); + do_pwrite(dep, packet, true); netif_pq_release(packet_get_id(packet)); -- dep->packet_count; @@ -750,9 +740,9 @@ /* switch(dep->de_sendmsg.m_type) { - case DL_WRITE: do_vwrite(&dep->de_sendmsg, TRUE, FALSE); break; - case DL_WRITEV: do_vwrite(&dep->de_sendmsg, TRUE, TRUE); break; - case DL_WRITEV_S: do_vwrite_s(&dep->de_sendmsg, TRUE); break; + case DL_WRITE: do_vwrite(&dep->de_sendmsg, true, false); break; + case DL_WRITEV: do_vwrite(&dep->de_sendmsg, true, true); break; + case DL_WRITEV_S: do_vwrite_s(&dep->de_sendmsg, true); break; default: - panic("", "dp8390: wrong type", dep->de_sendmsg.m_type); + fprintf(stderr, "dp8390: wrong type\n"); break; } @@ -914,7 +904,5 @@ } if (i == 100) - { - panic("", "dp8390: remote dma failed to complete", NO_NUM); - } + fprintf(stderr, "dp8390: remote dma failed to complete\n"); } @@ -933,6 +921,6 @@ int i, r, user_proc; vir_bytes bytes; - //u8_t two_bytes[2]; - u16_t two_bytes; + //uint8_t two_bytes[2]; + uint16_t two_bytes; int odd_byte; @@ -973,12 +961,9 @@ r= sys_vircopy(user_proc, D, vir_user, // SELF, D, (vir_bytes)&two_bytes[1], 1); - SELF, D, (vir_bytes)&(((u8_t *)&two_bytes)[1]), 1); + SELF, D, (vir_bytes)&(((uint8_t *)&two_bytes)[1]), 1); if (r != EOK) - { - panic("DP8390", - "dp_pio16_user2nic: sys_vircopy failed", - r); - } - //outw(dep->de_data_port, *(u16_t *)two_bytes); + fprintf(stderr, "DP8390: dp_pio16_user2nic: sys_vircopy failed\n"); + + //outw(dep->de_data_port, *(uint16_t *)two_bytes); outw(dep->de_data_port, two_bytes); count--; @@ -1005,11 +990,8 @@ r= sys_vircopy(user_proc, D, vir_user, // SELF, D, (vir_bytes)&two_bytes[0], 1); - SELF, D, (vir_bytes)&(((u8_t *)&two_bytes)[0]), 1); + SELF, D, (vir_bytes)&(((uint8_t *)&two_bytes)[0]), 1); if (r != EOK) - { - panic("DP8390", - "dp_pio16_user2nic: sys_vircopy failed", - r); - } + fprintf(stderr, "DP8390: dp_pio16_user2nic: sys_vircopy failed\n"); + count--; offset++; @@ -1022,5 +1004,5 @@ if (odd_byte) - //outw(dep->de_data_port, *(u16_t *)two_bytes); + //outw(dep->de_data_port, *(uint16_t *)two_bytes); outw(dep->de_data_port, two_bytes); @@ -1031,7 +1013,5 @@ } if (i == 100) - { - panic("", "dp8390: remote dma failed to complete", NO_NUM); - } + fprintf(stderr, "dp8390: remote dma failed to complete\n"); } @@ -1098,6 +1078,6 @@ int i, r, user_proc; vir_bytes bytes; - //u8_t two_bytes[2]; - u16_t two_bytes; + //uint8_t two_bytes[2]; + uint16_t two_bytes; int odd_byte; @@ -1136,12 +1116,9 @@ { //r= sys_vircopy(SELF, D, (vir_bytes)&two_bytes[1], - r= sys_vircopy(SELF, D, (vir_bytes)&(((u8_t *)&two_bytes)[1]), + r= sys_vircopy(SELF, D, (vir_bytes)&(((uint8_t *)&two_bytes)[1]), user_proc, D, vir_user, 1); if (r != EOK) - { - panic("DP8390", - "dp_pio16_nic2user: sys_vircopy failed", - r); - } + fprintf(stderr, "DP8390: dp_pio16_nic2user: sys_vircopy failed\n"); + count--; offset++; @@ -1165,15 +1142,12 @@ { assert(bytes == 1); - //*(u16_t *)two_bytes= inw(dep->de_data_port); + //*(uint16_t *)two_bytes= inw(dep->de_data_port); two_bytes= inw(dep->de_data_port); //r= sys_vircopy(SELF, D, (vir_bytes)&two_bytes[0], - r= sys_vircopy(SELF, D, (vir_bytes)&(((u8_t *)&two_bytes)[0]), + r= sys_vircopy(SELF, D, (vir_bytes)&(((uint8_t *)&two_bytes)[0]), user_proc, D, vir_user, 1); if (r != EOK) - { - panic("DP8390", - "dp_pio16_nic2user: sys_vircopy failed", - r); - } + fprintf(stderr, "DP8390: dp_pio16_nic2user: sys_vircopy failed\n"); + count--; offset++; @@ -1271,5 +1245,5 @@ if (r < 0) - panic("", "dp8390: send failed:", r); + fprintf(stderr, "dp8390: send failed\n"); */ dep->de_read_s = 0; @@ -1291,5 +1265,5 @@ SELF, D, (vir_bytes)loc_addr, count); if (r != EOK) - panic("DP8390", "get_userdata: sys_vircopy failed", r); + fprintf(stderr, "DP8390: get_userdata: sys_vircopy failed\n"); } Index: uspace/srv/hw/netif/dp8390/dp8390.h =================================================================== --- uspace/srv/hw/netif/dp8390/dp8390.h (revision fc23ef65a6fb1603dc17d24f990bb9c7df11a5b2) +++ uspace/srv/hw/netif/dp8390/dp8390.h (revision 74864ac490f3a00ce10100d8c028bfb72b246a54) @@ -11,10 +11,8 @@ #include - #include "dp8390_port.h" -/** Input/output size. - */ -#define DP8390_IO_SIZE 0x020 +/** Input/output size */ +#define DP8390_IO_SIZE 0x0020 /* National Semiconductor DP8390 Network Interface Controller. */ @@ -166,27 +164,24 @@ #define RSR_DFR 0x80 /* In later manuals: Deferring */ -/** Type definition of the receive header. - */ -typedef struct dp_rcvhdr -{ - /** Copy of rsr. - */ - u8_t dr_status; - /** Pointer to next packet. - */ - u8_t dr_next; - /** Receive Byte Count Low. - */ - u8_t dr_rbcl; - /** Receive Byte Count High. - */ - u8_t dr_rbch; +/** Type definition of the receive header + * + */ +typedef struct dp_rcvhdr { + /** Copy of rsr */ + uint8_t dr_status; + + /** Pointer to next packet */ + uint8_t dr_next; + + /** Receive Byte Count Low */ + uint8_t dr_rbcl; + + /** Receive Byte Count High */ + uint8_t dr_rbch; } dp_rcvhdr_t; -/** Page size. - */ -#define DP_PAGESIZE 256 - -/* Some macros to simplify accessing the dp8390 */ +/** Page size */ +#define DP_PAGESIZE 256 + /** Reads 1 byte from the zero page register. * @param[in] dep The network interface structure. @@ -194,5 +189,5 @@ * @returns The read value. */ -#define inb_reg0(dep, reg) (inb(dep->de_dp8390_port+reg)) +#define inb_reg0(dep, reg) (inb(dep->de_dp8390_port+reg)) /** Writes 1 byte zero page register. @@ -201,5 +196,5 @@ * @param[in] data The value to be written. */ -#define outb_reg0(dep, reg, data) (outb(dep->de_dp8390_port+reg, data)) +#define outb_reg0(dep, reg, data) (outb(dep->de_dp8390_port+reg, data)) /** Reads 1 byte from the first page register. @@ -208,5 +203,5 @@ * @returns The read value. */ -#define inb_reg1(dep, reg) (inb(dep->de_dp8390_port+reg)) +#define inb_reg1(dep, reg) (inb(dep->de_dp8390_port+reg)) /** Writes 1 byte first page register. @@ -215,5 +210,5 @@ * @param[in] data The value to be written. */ -#define outb_reg1(dep, reg, data) (outb(dep->de_dp8390_port+reg, data)) +#define outb_reg1(dep, reg, data) (outb(dep->de_dp8390_port+reg, data)) /* Software interface to the dp8390 driver */ @@ -222,37 +217,21 @@ struct iovec_dat; -_PROTOTYPE(typedef void (*dp_initf_t), (struct dpeth *dep) ); -_PROTOTYPE(typedef void (*dp_stopf_t), (struct dpeth *dep) ); -_PROTOTYPE(typedef void (*dp_user2nicf_t), (struct dpeth *dep, - struct iovec_dat *iovp, vir_bytes offset, - int nic_addr, vir_bytes count) ); -_PROTOTYPE(typedef void (*dp_nic2userf_t), (struct dpeth *dep, - int nic_addr, struct iovec_dat *iovp, - vir_bytes offset, vir_bytes count) ); -_PROTOTYPE(typedef void (*dp_getblock_t), (struct dpeth *dep, - int page, size_t offset, size_t size, void *dst) ); +typedef void (*dp_initf_t)(struct dpeth *dep); +typedef void (*dp_stopf_t)(struct dpeth *dep); +typedef void (*dp_user2nicf_t)(struct dpeth *dep, struct iovec_dat *iovp, vir_bytes offset, int nic_addr, vir_bytes count); +typedef void (*dp_nic2userf_t)(struct dpeth *dep, int nic_addr, struct iovec_dat *iovp, vir_bytes offset, vir_bytes count); +typedef void (*dp_getblock_t)(struct dpeth *dep, int page, size_t offset, size_t size, void *dst); #define IOVEC_NR 1 -typedef struct iovec_dat -{ +typedef struct iovec_dat { iovec_t iod_iovec[IOVEC_NR]; int iod_iovec_s; - // no direct process access int iod_proc_nr; vir_bytes iod_iovec_addr; } iovec_dat_t; -/* -typedef struct iovec_dat_s -{ - iovec_s_t iod_iovec[IOVEC_NR]; - int iod_iovec_s; - int iod_proc_nr; - cp_grant_id_t iod_grant; - vir_bytes iod_iovec_offset; -} iovec_dat_s_t; -*/ -#define SENDQ_NR 1 /* Maximum size of the send queue */ -#define SENDQ_PAGES 6 /* 6 * DP_PAGESIZE >= 1514 bytes */ + +#define SENDQ_NR 1 /* Maximum size of the send queue */ +#define SENDQ_PAGES 6 /* 6 * DP_PAGESIZE >= 1514 bytes */ /** Maximum number of waiting packets to be sent or received. @@ -260,23 +239,19 @@ #define MAX_PACKETS 4 -typedef struct dpeth -{ - /** Outgoing packets queue. - */ +typedef struct dpeth { + /** Outgoing packets queue */ packet_t *packet_queue; - /** Outgoing packets count. - */ + /** Outgoing packets count */ int packet_count; - /** Received packets queue. - */ + /** Received packets queue */ packet_t *received_queue; - /** Received packets count. - */ + /** Received packets count */ int received_count; - - /* The de_base_port field is the starting point of the probe. + + /* + * The de_base_port field is the starting point of the probe. * The conf routine also fills de_linmem and de_irq. If the probe * routine knows the irq and/or memory address because they are @@ -293,5 +268,6 @@ char de_name[sizeof("dp8390#n")]; - /* The initf function fills the following fields. Only cards that do + /* + * The initf function fills the following fields. Only cards that do * programmed I/O fill in the de_pata_port field. * In addition, the init routine has to fill in the sendq data @@ -309,12 +285,12 @@ /* Do it yourself send queue */ struct sendq { - int sq_filled; /* this buffer contains a packet */ - int sq_size; /* with this size */ - int sq_sendpage; /* starting page of the buffer */ + int sq_filled; /* this buffer contains a packet */ + int sq_size; /* with this size */ + int sq_sendpage; /* starting page of the buffer */ } de_sendq[SENDQ_NR]; int de_sendq_nr; - int de_sendq_head; /* Enqueue at the head */ - int de_sendq_tail; /* Dequeue at the tail */ + int de_sendq_head; /* Enqueue at the head */ + int de_sendq_tail; /* Dequeue at the tail */ /* Fields for internal use by the dp8390 driver. */ @@ -333,20 +309,20 @@ } dpeth_t; -#define DEI_DEFAULT 0x8000 - -#define DEF_EMPTY 0x000 -#define DEF_PACK_SEND 0x001 -#define DEF_PACK_RECV 0x002 -#define DEF_SEND_AVAIL 0x004 -#define DEF_READING 0x010 -#define DEF_PROMISC 0x040 -#define DEF_MULTI 0x080 -#define DEF_BROAD 0x100 -#define DEF_ENABLED 0x200 -#define DEF_STOPPED 0x400 - -#define DEM_DISABLED 0x0 -#define DEM_SINK 0x1 -#define DEM_ENABLED 0x2 +#define DEI_DEFAULT 0x8000 + +#define DEF_EMPTY 0x000 +#define DEF_PACK_SEND 0x001 +#define DEF_PACK_RECV 0x002 +#define DEF_SEND_AVAIL 0x004 +#define DEF_READING 0x010 +#define DEF_PROMISC 0x040 +#define DEF_MULTI 0x080 +#define DEF_BROAD 0x100 +#define DEF_ENABLED 0x200 +#define DEF_STOPPED 0x400 + +#define DEM_DISABLED 0x0 +#define DEM_SINK 0x1 +#define DEM_ENABLED 0x2 #endif Index: uspace/srv/hw/netif/dp8390/dp8390_module.c =================================================================== --- uspace/srv/hw/netif/dp8390/dp8390_module.c (revision fc23ef65a6fb1603dc17d24f990bb9c7df11a5b2) +++ uspace/srv/hw/netif/dp8390/dp8390_module.c (revision 74864ac490f3a00ce10100d8c028bfb72b246a54) @@ -261,5 +261,5 @@ do{ next = pq_detach(packet); - if(do_pwrite(dep, packet, FALSE) != EBUSY){ + if(do_pwrite(dep, packet, false) != EBUSY){ netif_pq_release(packet_get_id(packet)); } Index: uspace/srv/hw/netif/dp8390/dp8390_port.h =================================================================== --- uspace/srv/hw/netif/dp8390/dp8390_port.h (revision fc23ef65a6fb1603dc17d24f990bb9c7df11a5b2) +++ uspace/srv/hw/netif/dp8390/dp8390_port.h (revision 74864ac490f3a00ce10100d8c028bfb72b246a54) @@ -44,18 +44,4 @@ #include -/** Macro for difining functions. - * @param[in] function The function type and name definition. - * @param[in] params The function parameters definition. - */ -#define _PROTOTYPE(function, params) function params - -/** Type definition of the unsigned byte. - */ -typedef uint8_t u8_t; - -/** Type definition of the unsigned short. - */ -typedef uint16_t u16_t; - /** Compares two memory blocks. * @param[in] first The first memory block. @@ -66,5 +52,5 @@ * @returns 1 if the second is greater than the first. */ -#define memcmp(first, second, size) bcmp((char *) (first), (char *) (second), (size)) +#define memcmp(first, second, size) bcmp((char *) (first), (char *) (second), (size)) /** Reads 1 byte. @@ -72,5 +58,5 @@ * @returns The read value. */ -#define inb(port) pio_read_8((ioport8_t *) (port)) +#define inb(port) pio_read_8((ioport8_t *) (port)) /** Reads 1 word (2 bytes). @@ -78,5 +64,5 @@ * @returns The read value. */ -#define inw(port) pio_read_16((ioport16_t *) (port)) +#define inw(port) pio_read_16((ioport16_t *) (port)) /** Writes 1 byte. @@ -84,5 +70,5 @@ * @param[in] value The value to be written. */ -#define outb(port, value) pio_write_8((ioport8_t *) (port), (value)) +#define outb(port, value) pio_write_8((ioport8_t *) (port), (value)) /** Writes 1 word (2 bytes). @@ -90,10 +76,5 @@ * @param[in] value The value to be written. */ -#define outw(port, value) pio_write_16((ioport16_t *) (port), (value)) - -/** Prints out the driver critical error. - * Does not call the system panic(). - */ -#define panic(...) printf("%s%s%d", __VA_ARGS__) +#define outw(port, value) pio_write_16((ioport16_t *) (port), (value)) /** Copies a memory block. @@ -141,35 +122,17 @@ #define do_vir_outsw(port, proc, src, bytes) outsw((port), (void *)(src), (bytes)) -/* com.h */ /* Bits in 'DL_MODE' field of DL requests. */ -# define DL_NOMODE 0x0 -# define DL_PROMISC_REQ 0x2 -# define DL_MULTI_REQ 0x4 -# define DL_BROAD_REQ 0x8 - -/* const.h */ -/** True value. - */ -#define TRUE 1 /* used for turning integers into Booleans */ - -/** False value. - */ -#define FALSE 0 /* used for turning integers into Booleans */ - -/** No number value. - */ -#define NO_NUM 0x8000 /* used as numerical argument to panic() */ - -/* devio.h */ -//typedef u16_t port_t; +#define DL_NOMODE 0x0 +#define DL_PROMISC_REQ 0x2 +#define DL_MULTI_REQ 0x4 +#define DL_BROAD_REQ 0x8 + /** Type definition of a port. */ typedef long port_t; -/* dl_eth.h */ /** Ethernet statistics. */ -typedef struct eth_stat -{ +typedef struct eth_stat { /** Number of receive errors. */ @@ -242,5 +205,5 @@ /** Address data. */ - u8_t ea_addr[6]; + uint8_t ea_addr[6]; } ether_addr_t; Index: uspace/srv/hw/netif/dp8390/ne2000.c =================================================================== --- uspace/srv/hw/netif/dp8390/ne2000.c (revision fc23ef65a6fb1603dc17d24f990bb9c7df11a5b2) +++ uspace/srv/hw/netif/dp8390/ne2000.c (revision 74864ac490f3a00ce10100d8c028bfb72b246a54) @@ -16,11 +16,11 @@ #define N 100 -typedef int (*testf_t)(dpeth_t *dep, int pos, u8_t *pat); +typedef int (*testf_t)(dpeth_t *dep, int pos, uint8_t *pat); /** Data patterns */ -u8_t pat0[] = {0x00, 0x00, 0x00, 0x00}; -u8_t pat1[] = {0xFF, 0xFF, 0xFF, 0xFF}; -u8_t pat2[] = {0xA5, 0x5A, 0x69, 0x96}; -u8_t pat3[] = {0x96, 0x69, 0x5A, 0xA5}; +uint8_t pat0[] = {0x00, 0x00, 0x00, 0x00}; +uint8_t pat1[] = {0xFF, 0xFF, 0xFF, 0xFF}; +uint8_t pat2[] = {0xA5, 0x5A, 0x69, 0x96}; +uint8_t pat3[] = {0x96, 0x69, 0x5A, 0xA5}; /** Tests 8 bit NE2000 network interface. @@ -29,7 +29,7 @@ * @param[in] pat The data pattern to be written. * @returns True on success. - * @returns FALSE otherwise. - */ -static int test_8(dpeth_t *dep, int pos, u8_t *pat); + * @returns false otherwise. + */ +static int test_8(dpeth_t *dep, int pos, uint8_t *pat); /** Tests 16 bit NE2000 network interface. @@ -38,7 +38,7 @@ * @param[in] pat The data pattern to be written. * @returns True on success. - * @returns FALSE otherwise. - */ -static int test_16(dpeth_t *dep, int pos, u8_t *pat); + * @returns false otherwise. + */ +static int test_16(dpeth_t *dep, int pos, uint8_t *pat); /** Stops the NE2000 network interface. @@ -178,7 +178,7 @@ } -static int test_8(dpeth_t *dep, int pos, u8_t *pat) -{ - u8_t buf[4]; +static int test_8(dpeth_t *dep, int pos, uint8_t *pat) +{ + uint8_t buf[4]; int i; @@ -217,7 +217,7 @@ } -static int test_16(dpeth_t *dep, int pos, u8_t *pat) -{ - u8_t buf[4]; +static int test_16(dpeth_t *dep, int pos, uint8_t *pat) +{ + uint8_t buf[4]; int i; @@ -232,5 +232,5 @@ for (i = 0; i < 4; i += 2) - outw_ne(dep, NE_DATA, *(u16_t *)(pat + i)); + outw_ne(dep, NE_DATA, *(uint16_t *)(pat + i)); for (i = 0; i < N; i++) { @@ -251,5 +251,5 @@ for (i = 0; i < 4; i += 2) - *(u16_t *)(buf + i) = inw_ne(dep, NE_DATA); + *(uint16_t *)(buf + i) = inw_ne(dep, NE_DATA); return (memcmp(buf, pat, 4) == 0);