X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=UDI%2Fdrivers%2Fnet_ne2000%2Fne2000_common.h;h=59801fbb163e3774a17683e010070bcc98666c42;hb=c309c4a37b87140efca1866e794337629d569aed;hp=bfa27ea68a318feaba181bc3521d6a981c618834;hpb=a80a1a7c3ee2c4eab8ee0038d3da9f3d9c2f2c48;p=tpg%2Facess2.git

diff --git a/UDI/drivers/net_ne2000/ne2000_common.h b/UDI/drivers/net_ne2000/ne2000_common.h
index bfa27ea6..59801fbb 100644
--- a/UDI/drivers/net_ne2000/ne2000_common.h
+++ b/UDI/drivers/net_ne2000/ne2000_common.h
@@ -16,16 +16,37 @@
 
 #define ARRAY_SIZEOF(arr)	(sizeof(arr)/sizeof(arr[0]))
 
+enum {
+	NE2K_PIO_RESET,
+	NE2K_PIO_ENABLE,
+	NE2K_PIO_RX,
+	NE2K_PIO_IRQACK,
+	NE2K_PIO_TX,
+};
+
 typedef struct
 {
 	udi_init_context_t	init_context;
 
-	struct
-	{
+	udi_cb_t	*active_cb;
+
+	udi_intr_attach_cb_t	*intr_attach_cb;
+
+	struct {
 		udi_index_t	pio_index;
+		udi_index_t	n_intr_event_cb;
+	
+		udi_index_t	rx_chan_index;
 	} init;
 	
-	udi_pio_handle_t	pio_handles[1];
+	udi_pio_handle_t	pio_handles[4];
+	udi_channel_t	interrupt_channel;
+	udi_channel_t	rx_channel;
+	udi_channel_t	tx_channel;
+	
+	udi_nic_rx_cb_t	*rx_next_cb;
+	udi_ubit8_t	rx_next_page;
+	
 	udi_ubit8_t	macaddr[6];
 } ne2k_rdata_t;
 
@@ -62,12 +83,18 @@ typedef struct
 extern udi_channel_event_ind_op_t	ne2k_bus_dev_channel_event_ind;
 extern udi_bus_bind_ack_op_t	ne2k_bus_dev_bus_bind_ack;
 extern udi_pio_map_call_t	ne2k_bus_dev_bind__pio_map;
+extern udi_channel_spawn_call_t	ne2k_bus_dev_bind__intr_chanel;
+extern udi_cb_alloc_call_t	ne2k_bus_dev_bind__intr_attach;
 extern udi_bus_unbind_ack_op_t	ne2k_bus_dev_bus_unbind_ack;
 extern udi_intr_attach_ack_op_t	ne2k_bus_dev_intr_attach_ack;
+extern udi_cb_alloc_call_t	ne2k_bus_dev_bind__intr_event_cb;
+extern udi_pio_trans_call_t	ne2k_bus_dev_bind__card_reset;
 extern udi_intr_detach_ack_op_t	ne2k_bus_dev_intr_detach_ack;
 
 extern udi_channel_event_ind_op_t	ne2k_nd_ctrl_channel_event_ind;
 extern udi_nd_bind_req_op_t	ne2k_nd_ctrl_bind_req;
+extern udi_channel_spawn_call_t	ne2k_nd_ctrl_bind__tx_chan_ok;
+extern udi_channel_spawn_call_t	ne2k_nd_ctrl_bind__rx_chan_ok;
 extern udi_nd_unbind_req_op_t	ne2k_nd_ctrl_unbind_req;
 extern udi_nd_enable_req_op_t	ne2k_nd_ctrl_enable_req;
 extern udi_nd_disable_req_op_t	ne2k_nd_ctrl_disable_req;
@@ -81,5 +108,10 @@ extern udi_nd_exp_tx_req_op_t	ne2k_nd_tx_exp_tx_req;
 extern udi_channel_event_ind_op_t	ne2k_nd_rx_channel_event_ind;
 extern udi_nd_rx_rdy_op_t	ne2k_nd_rx_rx_rdy;
 
+extern udi_channel_event_ind_op_t	ne2k_bus_irq_channel_event_ind;
+extern udi_intr_event_ind_op_t	ne2k_bus_irq_intr_event_ind;
+
+extern void	ne2k_intr__rx_ok(udi_cb_t *gcb);
+
 #endif