From f3797f1919d3f17f43404fb353d1d6d821aae33a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Fr=C3=B6schle?= Date: Tue, 7 Jan 2014 05:57:17 +0000 Subject: [PATCH] cleaned up --- BaS_gcc/if/driver_vec.c | 4 ++-- BaS_gcc/include/bas_string.h | 1 + BaS_gcc/include/driver_vec.h | 22 +++++++++++----------- BaS_gcc/net/arp.c | 2 +- BaS_gcc/net/bootp.c | 2 +- BaS_gcc/net/fec.c | 2 +- BaS_gcc/net/ip.c | 4 ++++ BaS_gcc/net/udp.c | 5 +++-- 8 files changed, 24 insertions(+), 18 deletions(-) diff --git a/BaS_gcc/if/driver_vec.c b/BaS_gcc/if/driver_vec.c index e0afeea..ba1f177 100644 --- a/BaS_gcc/if/driver_vec.c +++ b/BaS_gcc/if/driver_vec.c @@ -47,8 +47,8 @@ static struct xhdi_driver_interface xhdi_call_interface = static struct dma_driver_interface dma_interface = { .version = 0x0101, - .magic = 'DMAC', - .dma_set_initiator = &dma_set_initiator, + .magic = 0x444d4143, /* 'DMAC' */ + .dma_set_initiator = dma_set_initiator, .dma_get_initiator = dma_get_initiator, .dma_free_initiator = dma_free_initiator, .dma_set_channel = dma_set_channel, diff --git a/BaS_gcc/include/bas_string.h b/BaS_gcc/include/bas_string.h index 67491f2..7edca59 100644 --- a/BaS_gcc/include/bas_string.h +++ b/BaS_gcc/include/bas_string.h @@ -35,6 +35,7 @@ extern char *strncat(char *dst, const char *src, size_t max); extern int atoi(const char *c); extern void *memcpy(void *dst, const void *src, size_t n); extern void *memset(void *s, int c, size_t n); +extern int memcmp(const char *s1, const char *s2, size_t max); extern void bzero(void *s, size_t n); #define isdigit(c) (((c) >= '0') && ((c) <= '9')) diff --git a/BaS_gcc/include/driver_vec.h b/BaS_gcc/include/driver_vec.h index 88c39a1..f70b98e 100644 --- a/BaS_gcc/include/driver_vec.h +++ b/BaS_gcc/include/driver_vec.h @@ -50,17 +50,17 @@ struct dma_driver_interface { int32_t version; int32_t magic; - int32_t (*dma_set_initiator)(int32_t initiator); - uint32_t (*dma_get_initiator)(int32_t requestor); - void (*dma_free_initiator)(int32_t requestor); - int32_t (*dma_set_channel)(int32_t requestor, void (*handler)(void)); - int32_t (*dma_get_channel)(int32_t requestor); - void (*dma_free_channel)(int32_t requestor); - void (*dma_clear_channel)(int32_t channel); - int32_t (*MCD_startDma)(long channel, - int8_t *srcAddr, uint32_t srcIncr, int8_t *destAddr, uint32_t destIncr, - uint32_t dmaSize, uint32_t xferSize, uint32_t initiator, int32_t priority, - uint32_t flags, uint32_t funcDesc); + int (*dma_set_initiator)(int initiator); + uint32_t (*dma_get_initiator)(int requestor); + void (*dma_free_initiator)(int requestor); + int (*dma_set_channel)(int requestor, void (*handler)(void)); + int (*dma_get_channel)(int requestor); + void (*dma_free_channel)(int requestor); + void (*dma_clear_channel)(int channel); + int (*MCD_startDma)(long channel, + int8_t *srcAddr, unsigned int srcIncr, int8_t *destAddr, unsigned int destIncr, + unsigned int dmaSize, unsigned int xferSize, unsigned int initiator, int priority, + unsigned int flags, unsigned int funcDesc); int32_t (*MCD_dmaStatus)(int32_t channel); int32_t (*MCD_XferProgrQuery)(int32_t channel, MCD_XferProg *progRep); int32_t (*MCD_killDma)(int32_t channel); diff --git a/BaS_gcc/net/arp.c b/BaS_gcc/net/arp.c index ca0a450..1c06059 100644 --- a/BaS_gcc/net/arp.c +++ b/BaS_gcc/net/arp.c @@ -11,7 +11,7 @@ #include #include -#define DBG_ARP +//#define DBG_ARP #ifdef DBG_ARP #define dbg(format, arg...) do { xprintf("DEBUG: " format, ##arg); } while (0) #else diff --git a/BaS_gcc/net/bootp.c b/BaS_gcc/net/bootp.c index 8019cba..6bfebff 100644 --- a/BaS_gcc/net/bootp.c +++ b/BaS_gcc/net/bootp.c @@ -11,7 +11,7 @@ #include #include "bas_printf.h" -#define DBG_BOOTP +//#define DBG_BOOTP #ifdef DBG_BOOTP #define dbg(format, arg...) do { xprintf("DEBUG: " format, ##arg); } while (0) #else diff --git a/BaS_gcc/net/fec.c b/BaS_gcc/net/fec.c index 7d856c6..c4e8b1f 100644 --- a/BaS_gcc/net/fec.c +++ b/BaS_gcc/net/fec.c @@ -18,7 +18,7 @@ #include "bas_printf.h" #include "util.h" #include "am79c874.h" -#include "bcm5222.h" +//#include "bcm5222.h" #include #if defined(MACHINE_FIREBEE) diff --git a/BaS_gcc/net/ip.c b/BaS_gcc/net/ip.c index 10d3982..c6279e4 100644 --- a/BaS_gcc/net/ip.c +++ b/BaS_gcc/net/ip.c @@ -289,6 +289,8 @@ void ip_handler(NIF *nif, NBUF *pNbuf) */ if (!validate_ip_hdr(nif, ipframe)) { + dbg("%s: not a valid IP packet!\r\n", __FUNCTION__); + nbuf_free(pNbuf); return; } @@ -308,6 +310,8 @@ void ip_handler(NIF *nif, NBUF *pNbuf) udp_handler(nif,pNbuf); break; default: + dbg("%s: no protocol handler registered for protocol %d\r\n", + __FUNCTION__, IP_PROTOCOL(ipframe)); nbuf_free(pNbuf); break; } diff --git a/BaS_gcc/net/udp.c b/BaS_gcc/net/udp.c index 55952a0..385e4e3 100644 --- a/BaS_gcc/net/udp.c +++ b/BaS_gcc/net/udp.c @@ -39,6 +39,7 @@ void udp_init(void) for (index = 0; index < UDP_MAX_PORTS; ++index) { udp_port_table[index].port = 0; + udp_port_table[index].handler = 0; } udp_port = DEFAULT_UDP_PORT; /* next free port */ @@ -88,7 +89,7 @@ static void *udp_port_handler(uint16_t port) { if (udp_port_table[index].port == port) { - return (void *)udp_port_table[index].handler; + return (void *) udp_port_table[index].handler; } } return NULL; @@ -116,7 +117,7 @@ int udp_send(NIF *nif, uint8_t *dest, int sport, int dport, NBUF *pNbuf) } /* - * This function takes data and creates a UDP frame and + * This function takes data, creates a UDP frame from it and * passes it onto the IP layer */ udp_frame_hdr *udpframe;