CVS commit: src/sys/dev/cardbus

[David Young]

Module Name:    src
Committed By:   dyoung
Date:           Thu Mar  4 22:34:37 UTC 2010

Modified Files:
        src/sys/dev/cardbus: if_ath_cardbus.c if_atw_cardbus.c

Log Message:
This is *always* compiled with #define rbus 1, so get rid of the
conditional compilation.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/cardbus/if_ath_cardbus.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/cardbus/if_atw_cardbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/cardbus/if_ath_cardbus.c
diff -u src/sys/dev/cardbus/if_ath_cardbus.c:1.41 src/sys/dev/cardbus/if_ath_cardbus.c:1.42
--- src/sys/dev/cardbus/if_ath_cardbus.c:1.41	Tue Mar  2 20:31:14 2010
+++ src/sys/dev/cardbus/if_ath_cardbus.c	Thu Mar  4 22:34:37 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ath_cardbus.c,v 1.41 2010/03/02 20:31:14 dyoung Exp $ */
+/*	$NetBSD: if_ath_cardbus.c,v 1.42 2010/03/04 22:34:37 dyoung Exp $ */
 /*
  * Copyright (c) 2003
  *	Ichiro FUKUHARA <ich...@ichiro.org>.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.41 2010/03/02 20:31:14 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.42 2010/03/04 22:34:37 dyoung Exp $");
 
 #include "opt_inet.h"
 
@@ -174,10 +174,6 @@
 	 */
 	if (Cardbus_mapreg_map(ct, ATH_PCI_MMBA, PCI_MAPREG_TYPE_MEM, 0,
 	    &csc->sc_iot, &csc->sc_ioh, &adr, &csc->sc_mapsize) == 0) {
-#if rbus
-#else
-		(*ct->ct_cf->cardbus_mem_open)(cc, 0, adr, adr+csc->sc_mapsize);
-#endif
 		csc->sc_bar_val = adr | PCI_MAPREG_TYPE_MEM;
 	} else {
 		aprint_error_dev(self, "unable to map device registers\n");

Index: src/sys/dev/cardbus/if_atw_cardbus.c
diff -u src/sys/dev/cardbus/if_atw_cardbus.c:1.33 src/sys/dev/cardbus/if_atw_cardbus.c:1.34
--- src/sys/dev/cardbus/if_atw_cardbus.c:1.33	Tue Mar  2 20:31:14 2010
+++ src/sys/dev/cardbus/if_atw_cardbus.c	Thu Mar  4 22:34:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atw_cardbus.c,v 1.33 2010/03/02 20:31:14 dyoung Exp $ */
+/* $NetBSD: if_atw_cardbus.c,v 1.34 2010/03/04 22:34:37 dyoung Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000, 2003 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atw_cardbus.c,v 1.33 2010/03/02 20:31:14 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atw_cardbus.c,v 1.34 2010/03/04 22:34:37 dyoung Exp $");
 
 #include "opt_inet.h"
 
@@ -215,10 +215,6 @@
 		printf("%s: atw_cardbus_attach mapped %d bytes mem space\n",
 		    device_xname(self), csc->sc_mapsize);
 #endif
-#if rbus
-#else
-		(*ct->ct_cf->cardbus_mem_open)(cc, 0, adr, adr+csc->sc_mapsize);
-#endif
 		csc->sc_csr |= PCI_COMMAND_MEM_ENABLE;
 		csc->sc_bar_reg = ATW_PCI_MMBA;
 		csc->sc_bar_val = adr | PCI_MAPREG_TYPE_MEM;
@@ -229,10 +225,6 @@
 		printf("%s: atw_cardbus_attach mapped %d bytes I/O space\n",
 		    device_xname(self), csc->sc_mapsize);
 #endif
-#if rbus
-#else
-		(*ct->ct_cf->cardbus_io_open)(cc, 0, adr, adr+csc->sc_mapsize);
-#endif
 		csc->sc_csr |= PCI_COMMAND_IO_ENABLE;
 		csc->sc_bar_reg = ATW_PCI_IOBA;
 		csc->sc_bar_val = adr | PCI_MAPREG_TYPE_IO;