X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=UDI%2Fdrivers%2Fnet_ne2000%2Fne2000_core.c;h=d630a8d4abba32239321b2db36416dbbce5daf1b;hb=9c4eedf4893f851bd1ba60ce541c8d098a9ef7f7;hp=71c066799a2b2bf5aba763c7ab4381057b79697e;hpb=908b2db268216ad0ebd57886f02038ba0d38499e;p=tpg%2Facess2.git

diff --git a/UDI/drivers/net_ne2000/ne2000_core.c b/UDI/drivers/net_ne2000/ne2000_core.c
index 71c06679..d630a8d4 100644
--- a/UDI/drivers/net_ne2000/ne2000_core.c
+++ b/UDI/drivers/net_ne2000/ne2000_core.c
@@ -5,8 +5,6 @@
  * ne2000_core.c
  * - UDI initialisation 
  */
-#include <udi.h>
-#include <udi_nic.h>
 #include "ne2000_common.h"
 
 enum {
@@ -36,6 +34,10 @@ enum {
 // --- Management
 void ne2k_usage_ind(udi_usage_cb_t *cb, udi_ubit8_t resource_level)
 {
+	ne2k_rdata_t	*rdata = UDI_GCB(cb)->context;
+
+	rdata->rx_next_page = NE2K_RX_FIRST_PG;
+	
 	udi_usage_res(cb);
 }
 void ne2k_enumerate_req(udi_enumerate_cb_t *cb, udi_ubit8_t enumeration_level)
@@ -62,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)
@@ -86,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,
@@ -236,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 );
 	// = = = =
 }
@@ -245,7 +253,14 @@ void ne2k_nd_ctrl_unbind_req(udi_nic_cb_t *cb)
 }
 void ne2k_nd_ctrl_enable_req(udi_nic_cb_t *cb)
 {
-	// Enable
+	udi_cb_t	*gcb = UDI_GCB(cb);
+	ne2k_rdata_t	*rdata = gcb->context;
+	udi_pio_trans(ne2k_nd_ctrl_enable_req__trans_done, gcb,
+		rdata->pio_handles[NE2K_PIO_ENABLE], 0, NULL, NULL);
+}
+void ne2k_nd_ctrl_enable_req__trans_done(udi_cb_t *gcb, udi_buf_t *new_buf, udi_status_t status, udi_ubit16_t res)
+{
+	udi_nsr_enable_ack( UDI_MCB(gcb, udi_nic_cb_t), status );
 }
 void ne2k_nd_ctrl_disable_req(udi_nic_cb_t *cb)
 {
@@ -262,6 +277,8 @@ void ne2k_bus_irq_channel_event_ind(udi_channel_event_cb_t *cb)
 }
 void ne2k_bus_irq_intr_event_ind(udi_intr_event_cb_t *cb, udi_ubit8_t flags)
 {
+	udi_debug_printf("ne2k_bus_irq_intr_event_ind: flags=%x, intr_result=%x\n",
+		flags, cb->intr_result);
 	if( cb->intr_result & 0x01 )
 	{
 		ne2k_intr__rx_ok( UDI_GCB(cb) );