Mon May 27 22:26:27 2013 UTC ()
Build fixes


(prlw1)
diff -r1.3 -r1.4 pkgsrc/sysutils/xentools42/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/xentools42/patches/patch-.._.._ipxe_src_drivers_net_ath5k_ath5k_qcu.c
diff -r0 -r1.1 pkgsrc/sysutils/xentools42/patches/patch-.._.._ipxe_src_drivers_net_ns83820.c
diff -r0 -r1.1 pkgsrc/sysutils/xentools42/patches/patch-.._.._ipxe_src_drivers_net_tulip.c
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/xentools42/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools42/Attic/distinfo 2013/05/26 20:27:43 1.3
+++ pkgsrc/sysutils/xentools42/Attic/distinfo 2013/05/27 22:26:27 1.4
@@ -1,25 +1,28 @@ @@ -1,25 +1,28 @@
1$NetBSD: distinfo,v 1.3 2013/05/26 20:27:43 bouyer Exp $ 1$NetBSD: distinfo,v 1.4 2013/05/27 22:26:27 prlw1 Exp $
2 2
3SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485 3SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485
4RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 4RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547
5Size (ipxe-git-v1.0.0.tar.gz) = 1996881 bytes 5Size (ipxe-git-v1.0.0.tar.gz) = 1996881 bytes
6SHA1 (xen-4.2.2.tar.gz) = b48cc7f375e9a5d65ff2d680f1b512dbea5a3b7c 6SHA1 (xen-4.2.2.tar.gz) = b48cc7f375e9a5d65ff2d680f1b512dbea5a3b7c
7RMD160 (xen-4.2.2.tar.gz) = 925cb2abdd080254a5457d1b304f811036261ab6 7RMD160 (xen-4.2.2.tar.gz) = 925cb2abdd080254a5457d1b304f811036261ab6
8Size (xen-4.2.2.tar.gz) = 15602746 bytes 8Size (xen-4.2.2.tar.gz) = 15602746 bytes
9SHA1 (patch-.._.._ipxe_src_Makefile.housekeeping) = 5ec8020a9705b2f64096c2942473a8de4db578bb 9SHA1 (patch-.._.._ipxe_src_Makefile.housekeeping) = 5ec8020a9705b2f64096c2942473a8de4db578bb
10SHA1 (patch-.._.._ipxe_src_arch_i386_include_librm.h) = 4549ac641b112321b4731a918d85219c3fce6808 10SHA1 (patch-.._.._ipxe_src_arch_i386_include_librm.h) = 4549ac641b112321b4731a918d85219c3fce6808
11SHA1 (patch-.._.._ipxe_src_arch_i386_scripts_i386.lds) = 4c0cbb7f535be43e1b6f53c284340a8bafc37c0b 11SHA1 (patch-.._.._ipxe_src_arch_i386_scripts_i386.lds) = 4c0cbb7f535be43e1b6f53c284340a8bafc37c0b
12SHA1 (patch-.._.._ipxe_src_core_settings.c) = 240ff973757403b983f12b2cbed826584c4a8aba 12SHA1 (patch-.._.._ipxe_src_core_settings.c) = 240ff973757403b983f12b2cbed826584c4a8aba
 13SHA1 (patch-.._.._ipxe_src_drivers_net_ath5k_ath5k_qcu.c) = eb86106d05d5cc3300b7b57b0e0c2fdd338bbf43
 14SHA1 (patch-.._.._ipxe_src_drivers_net_ns83820.c) = fbdfc47949f4946174b705d41d2b6c4405a68704
 15SHA1 (patch-.._.._ipxe_src_drivers_net_tulip.c) = 0d9370c64e5e6bf15a5b87944e03333a10e4a299
13SHA1 (patch-.._.._ipxe_src_net_tls.c) = 893c70515bc4cb0d4d9319fd94eddc4945f6a0b3 16SHA1 (patch-.._.._ipxe_src_net_tls.c) = 893c70515bc4cb0d4d9319fd94eddc4945f6a0b3
14SHA1 (patch-.._Config.mk) = ec5ba76be10e43cb1b2d37686e35d5fb81d8de80 17SHA1 (patch-.._Config.mk) = ec5ba76be10e43cb1b2d37686e35d5fb81d8de80
15SHA1 (patch-.._config_NetBSD.mk) = 90893326dcce4e3e2ef273f22ec5ddf5af0f7cd8 18SHA1 (patch-.._config_NetBSD.mk) = 90893326dcce4e3e2ef273f22ec5ddf5af0f7cd8
16SHA1 (patch-.._config_StdGNU.mk) = 3f93999038bd9d25277803cd1d969dc5733b593f 19SHA1 (patch-.._config_StdGNU.mk) = 3f93999038bd9d25277803cd1d969dc5733b593f
17SHA1 (patch-.._docs_man_xend-config.sxp.pod.5) = 36afc7b063f83adfe5b927ed0be586b102684020 20SHA1 (patch-.._docs_man_xend-config.sxp.pod.5) = 36afc7b063f83adfe5b927ed0be586b102684020
18SHA1 (patch-.._docs_man_xl.cfg.pod.5) = b9d19131ffb8a917a92c9878b86ea3dbc16dc0c8 21SHA1 (patch-.._docs_man_xl.cfg.pod.5) = b9d19131ffb8a917a92c9878b86ea3dbc16dc0c8
19SHA1 (patch-.._docs_man_xl.conf.pod.5) = 4009ff6aefb0a770ed42d096117dc97f8f55997f 22SHA1 (patch-.._docs_man_xl.conf.pod.5) = 4009ff6aefb0a770ed42d096117dc97f8f55997f
20SHA1 (patch-.._docs_man_xl.pod.1) = bd6272abed11c60c7c5ae88ae54377a3bfb921ed 23SHA1 (patch-.._docs_man_xl.pod.1) = bd6272abed11c60c7c5ae88ae54377a3bfb921ed
21SHA1 (patch-.._docs_man_xlcpupool.cfg.pod.5) = a693a79a1f1c16548f62f7da1fa58fa28030990f 24SHA1 (patch-.._docs_man_xlcpupool.cfg.pod.5) = a693a79a1f1c16548f62f7da1fa58fa28030990f
22SHA1 (patch-.._docs_man_xm.pod.1) = 975b7570da4bf9fd9cb79539fbd36b8dfbcbd571 25SHA1 (patch-.._docs_man_xm.pod.1) = 975b7570da4bf9fd9cb79539fbd36b8dfbcbd571
23SHA1 (patch-.._docs_man_xmdomain.cfg.pod.5) = 5563a72e203e789a86f4166c71ddb3fcff5215c6 26SHA1 (patch-.._docs_man_xmdomain.cfg.pod.5) = 5563a72e203e789a86f4166c71ddb3fcff5215c6
24SHA1 (patch-Makefile) = 37fbcd6d2f0279d4c04c91085b0e7f5611a5b92a 27SHA1 (patch-Makefile) = 37fbcd6d2f0279d4c04c91085b0e7f5611a5b92a
25SHA1 (patch-blktap_drivers_Makefile) = 0906a5ec3a7450fc987b01289e2560e60966d00d 28SHA1 (patch-blktap_drivers_Makefile) = 0906a5ec3a7450fc987b01289e2560e60966d00d
File Added: pkgsrc/sysutils/xentools42/patches/Attic/patch-.._.._ipxe_src_drivers_net_ath5k_ath5k_qcu.c
$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,
File Added: pkgsrc/sysutils/xentools42/patches/Attic/patch-.._.._ipxe_src_drivers_net_ns83820.c
$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();
File Added: pkgsrc/sysutils/xentools42/patches/Attic/patch-.._.._ipxe_src_drivers_net_tulip.c
$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;
 }