X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=UDI%2Fdrivers%2Fnet_ne2000%2Fne2000_core.c;h=d630a8d4abba32239321b2db36416dbbce5daf1b;hb=545c440973f9676efe7cb01edf9ec47b61023513;hp=6b9a81a0b85f4d6e67ece9cb37aaa8e5c6b2bde7;hpb=495b0190128abcb2a282331574b59ed2f0f59ee2;p=tpg%2Facess2.git

diff --git a/UDI/drivers/net_ne2000/ne2000_core.c b/UDI/drivers/net_ne2000/ne2000_core.c
index 6b9a81a0..d630a8d4 100644
--- a/UDI/drivers/net_ne2000/ne2000_core.c
+++ b/UDI/drivers/net_ne2000/ne2000_core.c
@@ -5,10 +5,6 @@
  * ne2000_core.c
  * - UDI initialisation 
  */
-#define UDI_VERSION	0x101
-#define UDI_NIC_VERSION	0x101
-#include <udi.h>
-#include <udi_nic.h>
 #include "ne2000_common.h"
 
 enum {
@@ -68,6 +64,9 @@ void ne2k_enumerate_req(udi_enumerate_cb_t *cb, udi_ubit8_t enumeration_level)
 	case UDI_ENUMERATE_NEXT:
 		udi_enumerate_ack(cb, UDI_ENUMERATE_DONE, 0);
 		break;
+	default:
+		udi_assert(!"invalid enumeration_level");
+		break;
 	}
 }
 void ne2k_devmgmt_req(udi_mgmt_cb_t *cb, udi_ubit8_t mgmt_op, udi_ubit8_t parent_ID)
@@ -92,6 +91,9 @@ void ne2k_bus_dev_channel_event_ind(udi_channel_event_cb_t *cb)
 		udi_bus_bind_req( bus_bind_cb );
 		// continue at ne2k_bus_dev_bus_bind_ack
 		return; }
+	default:
+		udi_assert(!"invalid channel event");
+		break;
 	}
 }
 void ne2k_bus_dev_bus_bind_ack(udi_bus_bind_cb_t *cb,
@@ -242,7 +244,7 @@ void ne2k_nd_ctrl_bind__rx_chan_ok(udi_cb_t *gcb, udi_channel_t new_channel)
 	cb->max_perfect_multicast = 0;
 	cb->max_total_multicast = 0;
 	cb->mac_addr_len = 6;
-	memcpy(cb->mac_addr, rdata->macaddr, 6);
+	udi_memcpy(cb->mac_addr, rdata->macaddr, 6);
 	udi_nsr_bind_ack( cb, UDI_OK );
 	// = = = =
 }