[src/trunk]: src/sys/dev/cardbus sc_csr is read & written from the PCI Comman...

[dyoung <dyoung%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/791ccaf4a0f1
branches:  trunk
changeset: 752442:791ccaf4a0f1
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Fri Feb 26 00:01:27 2010 +0000

description:
sc_csr is read & written from the PCI Command & Status Register,
so make its type pcireg_t.

diffstat:

 sys/dev/cardbus/adv_cardbus.c    |  6 +++---
 sys/dev/cardbus/ahc_cardbus.c    |  6 +++---
 sys/dev/cardbus/if_ex_cardbus.c  |  6 +++---
 sys/dev/cardbus/if_re_cardbus.c  |  6 +++---
 sys/dev/cardbus/if_rtk_cardbus.c |  6 +++---
 sys/dev/cardbus/if_tlp_cardbus.c |  6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diffs (162 lines):

diff -r aef91f18843d -r 791ccaf4a0f1 sys/dev/cardbus/adv_cardbus.c
--- a/sys/dev/cardbus/adv_cardbus.c     Thu Feb 25 23:44:02 2010 +0000
+++ b/sys/dev/cardbus/adv_cardbus.c     Fri Feb 26 00:01:27 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: adv_cardbus.c,v 1.24 2010/02/25 23:40:39 dyoung Exp $  */
+/*     $NetBSD: adv_cardbus.c,v 1.25 2010/02/26 00:01:27 dyoung Exp $  */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adv_cardbus.c,v 1.24 2010/02/25 23:40:39 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adv_cardbus.c,v 1.25 2010/02/26 00:01:27 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -77,7 +77,7 @@
        pcitag_t sc_tag;
 
        int     sc_bar;
-       int     sc_csr;                 /* CSR bits */
+       pcireg_t        sc_csr;
        bus_size_t sc_size;
 };
 
diff -r aef91f18843d -r 791ccaf4a0f1 sys/dev/cardbus/ahc_cardbus.c
--- a/sys/dev/cardbus/ahc_cardbus.c     Thu Feb 25 23:44:02 2010 +0000
+++ b/sys/dev/cardbus/ahc_cardbus.c     Fri Feb 26 00:01:27 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ahc_cardbus.c,v 1.31 2010/02/25 23:40:39 dyoung Exp $  */
+/*     $NetBSD: ahc_cardbus.c,v 1.32 2010/02/26 00:01:27 dyoung Exp $  */
 
 /*-
  * Copyright (c) 2000, 2005 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahc_cardbus.c,v 1.31 2010/02/25 23:40:39 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahc_cardbus.c,v 1.32 2010/02/26 00:01:27 dyoung Exp $");
 
 #include "opt_ahc_cardbus.h"
 
@@ -80,7 +80,7 @@
        pcitag_t sc_tag;
 
        int     sc_bar;
-       int     sc_csr;                 /* CSR bits */
+       pcireg_t        sc_csr;
        bus_size_t sc_size;
 };
 
diff -r aef91f18843d -r 791ccaf4a0f1 sys/dev/cardbus/if_ex_cardbus.c
--- a/sys/dev/cardbus/if_ex_cardbus.c   Thu Feb 25 23:44:02 2010 +0000
+++ b/sys/dev/cardbus/if_ex_cardbus.c   Fri Feb 26 00:01:27 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ex_cardbus.c,v 1.48 2010/02/25 23:40:39 dyoung Exp $        */
+/*     $NetBSD: if_ex_cardbus.c,v 1.49 2010/02/26 00:01:27 dyoung Exp $        */
 
 /*
  * Copyright (c) 1998 and 1999
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.48 2010/02/25 23:40:39 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.49 2010/02/26 00:01:27 dyoung Exp $");
 
 /* #define EX_DEBUG 4 */       /* define to report information for debugging */
 
@@ -106,7 +106,7 @@
 
        pcitag_t sc_tag;
 
-       int     sc_csr;                 /* CSR bits */
+       pcireg_t        sc_csr;
        int     sc_bar_reg;             /* which BAR to use */
        pcireg_t sc_bar_val;            /* value of the BAR */
        int     sc_bar_reg1;            /* which BAR to use */
diff -r aef91f18843d -r 791ccaf4a0f1 sys/dev/cardbus/if_re_cardbus.c
--- a/sys/dev/cardbus/if_re_cardbus.c   Thu Feb 25 23:44:02 2010 +0000
+++ b/sys/dev/cardbus/if_re_cardbus.c   Fri Feb 26 00:01:27 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_re_cardbus.c,v 1.22 2010/02/25 23:40:39 dyoung Exp $        */
+/*     $NetBSD: if_re_cardbus.c,v 1.23 2010/02/26 00:01:27 dyoung Exp $        */
 
 /*
  * Copyright (c) 2004 Jonathan Stone
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_re_cardbus.c,v 1.22 2010/02/25 23:40:39 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_re_cardbus.c,v 1.23 2010/02/26 00:01:27 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -92,7 +92,7 @@
        void *sc_ih;
        cardbus_devfunc_t sc_ct;
        pcitag_t sc_tag;
-       int sc_csr;
+       pcireg_t sc_csr;
        int sc_bar_reg;
        pcireg_t sc_bar_val;
        bus_size_t sc_mapsize;
diff -r aef91f18843d -r 791ccaf4a0f1 sys/dev/cardbus/if_rtk_cardbus.c
--- a/sys/dev/cardbus/if_rtk_cardbus.c  Thu Feb 25 23:44:02 2010 +0000
+++ b/sys/dev/cardbus/if_rtk_cardbus.c  Fri Feb 26 00:01:27 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_rtk_cardbus.c,v 1.41 2010/02/25 23:40:39 dyoung Exp $       */
+/*     $NetBSD: if_rtk_cardbus.c,v 1.42 2010/02/26 00:01:27 dyoung Exp $       */
 
 /*
  * Copyright (c) 2000 Masanori Kanaoka
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.41 2010/02/25 23:40:39 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.42 2010/02/26 00:01:27 dyoung Exp $");
 
 #include "opt_inet.h"
 #include "rnd.h"
@@ -127,7 +127,7 @@
        void *sc_ih;
        cardbus_devfunc_t sc_ct;
        pcitag_t sc_tag;
-       int sc_csr;
+       pcireg_t sc_csr;
        int sc_bar_reg;
        pcireg_t sc_bar_val;
        bus_size_t sc_mapsize;
diff -r aef91f18843d -r 791ccaf4a0f1 sys/dev/cardbus/if_tlp_cardbus.c
--- a/sys/dev/cardbus/if_tlp_cardbus.c  Thu Feb 25 23:44:02 2010 +0000
+++ b/sys/dev/cardbus/if_tlp_cardbus.c  Fri Feb 26 00:01:27 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_tlp_cardbus.c,v 1.64 2010/02/25 23:40:39 dyoung Exp $       */
+/*     $NetBSD: if_tlp_cardbus.c,v 1.65 2010/02/26 00:01:27 dyoung Exp $       */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_cardbus.c,v 1.64 2010/02/25 23:40:39 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_cardbus.c,v 1.65 2010/02/26 00:01:27 dyoung Exp $");
 
 #include "opt_inet.h"
 
@@ -96,7 +96,7 @@
        void    *sc_ih;                 /* interrupt handle */
        cardbus_devfunc_t sc_ct;        /* our CardBus devfuncs */
        pcitag_t sc_tag;                /* our CardBus tag */
-       int     sc_csr;                 /* CSR bits */
+       pcireg_t sc_csr;
        bus_size_t sc_mapsize;          /* the size of mapped bus space
                                           region */