Build fixes

4 files changed, 59 insertions, 1 deletions

diff --git a/sysutils/xentools42/distinfo b/sysutils/xentools42/distinfo
index dbe45df8842..4b5bfba116b 100644
--- a/sysutils/xentools42/distinfo
+++ b/sysutils/xentools42/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2013/05/26 20:27:43 bouyer Exp $
+$NetBSD: distinfo,v 1.4 2013/05/27 22:26:27 prlw1 Exp $
 
 SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485
 RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547
@@ -10,6 +10,9 @@ SHA1 (patch-.._.._ipxe_src_Makefile.housekeeping) = 5ec8020a9705b2f64096c2942473
 SHA1 (patch-.._.._ipxe_src_arch_i386_include_librm.h) = 4549ac641b112321b4731a918d85219c3fce6808
 SHA1 (patch-.._.._ipxe_src_arch_i386_scripts_i386.lds) = 4c0cbb7f535be43e1b6f53c284340a8bafc37c0b
 SHA1 (patch-.._.._ipxe_src_core_settings.c) = 240ff973757403b983f12b2cbed826584c4a8aba
+SHA1 (patch-.._.._ipxe_src_drivers_net_ath5k_ath5k_qcu.c) = eb86106d05d5cc3300b7b57b0e0c2fdd338bbf43
+SHA1 (patch-.._.._ipxe_src_drivers_net_ns83820.c) = fbdfc47949f4946174b705d41d2b6c4405a68704
+SHA1 (patch-.._.._ipxe_src_drivers_net_tulip.c) = 0d9370c64e5e6bf15a5b87944e03333a10e4a299
 SHA1 (patch-.._.._ipxe_src_net_tls.c) = 893c70515bc4cb0d4d9319fd94eddc4945f6a0b3
 SHA1 (patch-.._Config.mk) = ec5ba76be10e43cb1b2d37686e35d5fb81d8de80
 SHA1 (patch-.._config_NetBSD.mk) = 90893326dcce4e3e2ef273f22ec5ddf5af0f7cd8
diff --git a/sysutils/xentools42/patches/patch-.._.._ipxe_src_drivers_net_ath5k_ath5k_qcu.c b/sysutils/xentools42/patches/patch-.._.._ipxe_src_drivers_net_ath5k_ath5k_qcu.c
new file mode 100644
index 00000000000..25513e8e4ed
--- /dev/null
+++ b/sysutils/xentools42/patches/patch-.._.._ipxe_src_drivers_net_ath5k_ath5k_qcu.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-.._.._ipxe_src_drivers_net_ath5k_ath5k_qcu.c,v 1.1 2013/05/27 22:26:27 prlw1 Exp $
+
+Build fix for
+comparison between 'enum ath5k_tx_queue' and 'enum ath5k_tx_queue_id'
+
+--- ../../ipxe/src/drivers/net/ath5k/ath5k_qcu.c.orig	2010-02-02 16:12:44.000000000 +0000
++++ ../../ipxe/src/drivers/net/ath5k/ath5k_qcu.c
+@@ -268,7 +268,7 @@ int ath5k_hw_reset_tx_queue(struct ath5k
+ 		}
+ 
+ 		if (tq->tqi_ready_time &&
+-		(tq->tqi_type != AR5K_TX_QUEUE_ID_CAB))
++		(tq->tqi_type != AR5K_TX_QUEUE_CAB))
+ 			ath5k_hw_reg_write(ah, AR5K_REG_SM(tq->tqi_ready_time,
+ 				AR5K_QCU_RDYTIMECFG_INTVAL) |
+ 				AR5K_QCU_RDYTIMECFG_ENABLE,
diff --git a/sysutils/xentools42/patches/patch-.._.._ipxe_src_drivers_net_ns83820.c b/sysutils/xentools42/patches/patch-.._.._ipxe_src_drivers_net_ns83820.c
new file mode 100644
index 00000000000..3b4ed8c5649
--- /dev/null
+++ b/sysutils/xentools42/patches/patch-.._.._ipxe_src_drivers_net_ns83820.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-.._.._ipxe_src_drivers_net_ns83820.c,v 1.1 2013/05/27 22:26:27 prlw1 Exp $
+
+Build fix.
+
+--- ../../ipxe/src/drivers/net/ns83820.c.orig	2010-02-02 16:12:44.000000000 +0000
++++ ../../ipxe/src/drivers/net/ns83820.c
+@@ -687,7 +687,7 @@ static int ns83820_poll(struct nic *nic,
+ 	//			rx_ring[entry].link = 0;
+ 	rx_ring[entry].cmdsts = cpu_to_le32(CMDSTS_OWN);
+ 
+-	ns->cur_rx = ++ns->cur_rx % NR_RX_DESC;
++	ns->cur_rx = (ns->cur_rx + 1) % NR_RX_DESC;
+ 
+ 	if (ns->cur_rx == 0)	/* We have wrapped the ring */
+ 	  kick_rx();
diff --git a/sysutils/xentools42/patches/patch-.._.._ipxe_src_drivers_net_tulip.c b/sysutils/xentools42/patches/patch-.._.._ipxe_src_drivers_net_tulip.c
new file mode 100644
index 00000000000..3a8bf64d854
--- /dev/null
+++ b/sysutils/xentools42/patches/patch-.._.._ipxe_src_drivers_net_tulip.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-.._.._ipxe_src_drivers_net_tulip.c,v 1.1 2013/05/27 22:26:27 prlw1 Exp $
+
+Build fix.
+
+--- ../../ipxe/src/drivers/net/tulip.c.orig	2010-02-02 16:12:44.000000000 +0000
++++ ../../ipxe/src/drivers/net/tulip.c
+@@ -1171,7 +1171,7 @@ static int tulip_poll(struct nic *nic, i
+     if (rx_ring[tp->cur_rx].status & 0x00008000) {
+ 	/* return the descriptor and buffer to receive ring */
+         rx_ring[tp->cur_rx].status = 0x80000000;
+-	tp->cur_rx = (++tp->cur_rx) % RX_RING_SIZE;
++	tp->cur_rx = (tp->cur_rx + 1) % RX_RING_SIZE;
+         return 0;
+     }
+ 
+@@ -1180,7 +1180,7 @@ static int tulip_poll(struct nic *nic, i
+ 
+     /* return the descriptor and buffer to receive ring */
+     rx_ring[tp->cur_rx].status = 0x80000000;
+-    tp->cur_rx = (++tp->cur_rx) % RX_RING_SIZE;
++    tp->cur_rx = (tp->cur_rx + 1) % RX_RING_SIZE;
+ 
+     return 1;
+ }