X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=UDI%2Fdrivers%2Fnet_ne2000%2Fne2000_rx.c;h=9b4b3c32370195dd8c62dd15049beb268517c408;hb=7e9bbefbdcbfdba27eb6cdacae0811f428483892;hp=f38f51076c48e3b88124a5d9100c7616e5ab3951;hpb=ba60880472a507ff724595f29830753ec8aad40e;p=tpg%2Facess2.git

diff --git a/UDI/drivers/net_ne2000/ne2000_rx.c b/UDI/drivers/net_ne2000/ne2000_rx.c
index f38f5107..9b4b3c32 100644
--- a/UDI/drivers/net_ne2000/ne2000_rx.c
+++ b/UDI/drivers/net_ne2000/ne2000_rx.c
@@ -5,11 +5,14 @@
  * ne2000_rx.c
  * - Receive Code
  */
+#define UDI_VERSION	0x101
+#define UDI_NIC_VERSION	0x101
 #include <udi.h>
 #include <udi_nic.h>
 #include "ne2000_common.h"
 
 // === PROTOTYPES ===
+udi_buf_write_call_t	ne2k_rx__buf_allocated;
 udi_pio_trans_call_t	ne2k_rx__complete;
 
 // === CODE ===
@@ -18,6 +21,22 @@ void ne2k_nd_rx_channel_event_ind(udi_channel_event_cb_t *cb)
 }
 void ne2k_nd_rx_rx_rdy(udi_nic_rx_cb_t *cb)
 {
+	udi_cb_t	*gcb = UDI_GCB(cb);
+	ne2k_rdata_t	*rdata = gcb->context;
+	
+	// Add cb(s) to avaliable list
+	if( rdata->rx_next_cb ) {
+		rdata->rx_last_cb->chain = cb;
+	}
+	else {
+		rdata->rx_next_cb = cb;
+	}
+	rdata->rx_last_cb = cb;
+	// Follow new chain
+	while( rdata->rx_last_cb->chain ) {
+		rdata->rx_last_cb = rdata->rx_last_cb->chain;
+	}
+	
 }
 void ne2k_intr__rx_ok(udi_cb_t *gcb)
 {
@@ -27,18 +46,31 @@ void ne2k_intr__rx_ok(udi_cb_t *gcb)
 		udi_nic_rx_cb_t	*rx_cb = rdata->rx_next_cb;
 		rdata->rx_next_cb = rx_cb->chain;
 		rx_cb->chain = NULL;
-		udi_pio_trans(ne2k_rx__complete, UDI_GCB(rx_cb),
-			rdata->pio_handles[NE2K_PIO_RX], 0, NULL, &rdata->rx_next_page);
+		udi_debug_printf("ne2k_intr__rx_ok: Initialising buffer\n");
+		udi_buf_write(ne2k_rx__buf_allocated, UDI_GCB(rx_cb), NULL, 1520, rx_cb->rx_buf, 0, 0, UDI_NULL_BUF_PATH);
 	}
 	else
 	{
 		// Drop packet due to no free cbs
+		udi_debug_printf("ne2k_intr__rx_ok: Dropped due to no free rx cbs\n");
+		// TODO: Tell hardware to drop packet
 	}
 }
 
+void ne2k_rx__buf_allocated(udi_cb_t *gcb, udi_buf_t *new_buf)
+{
+	ne2k_rdata_t	*rdata = gcb->context;
+	udi_nic_rx_cb_t	*rx_cb = UDI_MCB(gcb, udi_nic_rx_cb_t);
+	
+	udi_debug_printf("ne2k_rx__buf_allocated: Buffer ready, cb=%p\n", rx_cb);
+	udi_pio_trans(ne2k_rx__complete, gcb,
+		rdata->pio_handles[NE2K_PIO_RX], 0, rx_cb->rx_buf, &rdata->rx_next_page);
+}
+
 void ne2k_rx__complete(udi_cb_t *gcb, udi_buf_t *new_buf, udi_status_t status, udi_ubit16_t result)
 {
 	udi_nic_rx_cb_t	*rx_cb = UDI_MCB(gcb, udi_nic_rx_cb_t);
+	rx_cb->rx_buf->buf_size = result;
 	// TODO: Check result
 	udi_nsr_rx_ind( rx_cb );
 }