Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- ansify

Browse Source 
- use POSIX integers
This commit is contained in:
cegger 2008-04-14 21:20:41 +00:00
parent b39bec86b0
commit 1b5ffa90ad
3 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/dev/cardbus/if_ex_cardbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ex_cardbus.c,v 1.43 2008/04/14 20:03:13 spz Exp $ */ /* $NetBSD: if_ex_cardbus.c,v 1.44 2008/04/14 21:20:41 cegger Exp $ */
/* /*
* CardBus specific routines for 3Com 3C575-family CardBus ethernet adapter * CardBus specific routines for 3Com 3C575-family CardBus ethernet adapter
@ -37,7 +37,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.43 2008/04/14 20:03:13 spz Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.44 2008/04/14 21:20:41 cegger Exp $");
/* #define EX_DEBUG 4 */ /* define to report information for debugging */ /* #define EX_DEBUG 4 */ /* define to report information for debugging */
@ -84,7 +84,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.43 2008/04/14 20:03:13 spz Exp $
#define EX_CB_INTR_ACK 0x8000 /* intr acknowledge bit */ #define EX_CB_INTR_ACK 0x8000 /* intr acknowledge bit */
int ex_cardbus_match(device_t, cfdata_t, void *); int ex_cardbus_match(device_t, cfdata_t, void *);
void ex_cardbus_attach(device_t, device_t,void *); void ex_cardbus_attach(device_t, device_t, void *);
int ex_cardbus_detach(device_t, int); int ex_cardbus_detach(device_t, int);
void ex_cardbus_intr_ack(struct ex_softc *); void ex_cardbus_intr_ack(struct ex_softc *);
@ -96,10 +96,10 @@ struct ex_cardbus_softc {
cardbus_devfunc_t sc_ct; cardbus_devfunc_t sc_ct;
int sc_intrline; int sc_intrline;
u_int8_t sc_cardbus_flags; uint8_t sc_cardbus_flags;
#define EX_REATTACH 0x01 #define EX_REATTACH 0x01
#define EX_ABSENT 0x02 #define EX_ABSENT 0x02
u_int8_t sc_cardtype; uint8_t sc_cardtype;
#define EX_CB_BOOMERANG 1 #define EX_CB_BOOMERANG 1
#define EX_CB_CYCLONE 2 #define EX_CB_CYCLONE 2
@ -124,7 +124,7 @@ CFATTACH_DECL_NEW(ex_cardbus, sizeof(struct ex_cardbus_softc),
ex_cardbus_match, ex_cardbus_attach, ex_cardbus_detach, ex_activate); ex_cardbus_match, ex_cardbus_attach, ex_cardbus_detach, ex_activate);
const struct ex_cardbus_product { const struct ex_cardbus_product {
u_int32_t ecp_prodid; /* CardBus product ID */ uint32_t ecp_prodid; /* CardBus product ID */
int ecp_flags; /* initial softc flags */ int ecp_flags; /* initial softc flags */
pcireg_t ecp_csr; /* PCI CSR flags */ pcireg_t ecp_csr; /* PCI CSR flags */
int ecp_cardtype; /* card type */ int ecp_cardtype; /* card type */
@ -190,8 +190,7 @@ const struct ex_cardbus_product *ex_cardbus_lookup
(const struct cardbus_attach_args *); (const struct cardbus_attach_args *);
const struct ex_cardbus_product * const struct ex_cardbus_product *
ex_cardbus_lookup(ca) ex_cardbus_lookup(const struct cardbus_attach_args *ca)
const struct cardbus_attach_args *ca;
{ {
const struct ex_cardbus_product *ecp; const struct ex_cardbus_product *ecp;
@ -306,8 +305,7 @@ ex_cardbus_attach(device_t parent, device_t self, void *aux)
} }
void void
ex_cardbus_intr_ack(sc) ex_cardbus_intr_ack(struct ex_softc *sc)
struct ex_softc *sc;
{ {
struct ex_cardbus_softc *csc = (struct ex_cardbus_softc *)sc; struct ex_cardbus_softc *csc = (struct ex_cardbus_softc *)sc;
@ -349,8 +347,7 @@ ex_cardbus_detach(device_t self, int arg)
} }
int int
ex_cardbus_enable(sc) ex_cardbus_enable(struct ex_softc *sc)
struct ex_softc *sc;
{ {
struct ex_cardbus_softc *csc = (struct ex_cardbus_softc *)sc; struct ex_cardbus_softc *csc = (struct ex_cardbus_softc *)sc;
cardbus_function_tag_t cf = csc->sc_ct->ct_cf; cardbus_function_tag_t cf = csc->sc_ct->ct_cf;
@ -371,8 +368,7 @@ ex_cardbus_enable(sc)
} }
void void
ex_cardbus_disable(sc) ex_cardbus_disable(struct ex_softc *sc)
struct ex_softc *sc;
{ {
struct ex_cardbus_softc *csc = (struct ex_cardbus_softc *)sc; struct ex_cardbus_softc *csc = (struct ex_cardbus_softc *)sc;
cardbus_function_tag_t cf = csc->sc_ct->ct_cf; cardbus_function_tag_t cf = csc->sc_ct->ct_cf;
@ -386,8 +382,7 @@ ex_cardbus_disable(sc)
} }
void void
ex_cardbus_setup(csc) ex_cardbus_setup(struct ex_cardbus_softc *csc)
struct ex_cardbus_softc *csc;
{ {
cardbus_devfunc_t ct = csc->sc_ct; cardbus_devfunc_t ct = csc->sc_ct;
cardbus_chipset_tag_t cc = ct->ct_cc; cardbus_chipset_tag_t cc = ct->ct_cc;

6
sys/dev/ic/elinkxl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: elinkxl.c,v 1.103 2008/04/14 20:03:13 spz Exp $ */ /* $NetBSD: elinkxl.c,v 1.104 2008/04/14 21:20:41 cegger Exp $ */
/*- /*-
* Copyright (c) 1998 The NetBSD Foundation, Inc. * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.103 2008/04/14 20:03:13 spz Exp $"); __KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.104 2008/04/14 21:20:41 cegger Exp $");
#include "bpfilter.h" #include "bpfilter.h"
#include "rnd.h" #include "rnd.h"
@ -411,7 +411,7 @@ ex_config(struct ex_softc *sc)
} else } else
ex_probemedia(sc); ex_probemedia(sc);
strlcpy(ifp->if_xname, device_xname(sc->sc_dev),IFNAMSIZ); strlcpy(ifp->if_xname, device_xname(sc->sc_dev), IFNAMSIZ);
ifp->if_softc = sc; ifp->if_softc = sc;
ifp->if_start = ex_start; ifp->if_start = ex_start;
ifp->if_ioctl = ex_ioctl; ifp->if_ioctl = ex_ioctl;

18
sys/dev/pci/if_ex_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ex_pci.c,v 1.47 2008/04/14 20:03:13 spz Exp $ */ /* $NetBSD: if_ex_pci.c,v 1.48 2008/04/14 21:20:41 cegger Exp $ */
/*- /*-
* Copyright (c) 1998 The NetBSD Foundation, Inc. * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ex_pci.c,v 1.47 2008/04/14 20:03:13 spz Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_ex_pci.c,v 1.48 2008/04/14 21:20:41 cegger Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -112,7 +112,7 @@ CFATTACH_DECL_NEW(ex_pci, sizeof(struct ex_pci_softc),
ex_pci_match, ex_pci_attach, NULL, NULL); ex_pci_match, ex_pci_attach, NULL, NULL);
static const struct ex_pci_product { static const struct ex_pci_product {
u_int32_t epp_prodid; /* PCI product ID */ uint32_t epp_prodid; /* PCI product ID */
int epp_flags; /* initial softc flags */ int epp_flags; /* initial softc flags */
const char *epp_name; /* device name */ const char *epp_name; /* device name */
} ex_pci_products[] = { } ex_pci_products[] = {
@ -342,12 +342,12 @@ ex_d3tod0(pci_chipset_tag_t pc, pcitag_t tag, device_t self, pcireg_t state)
#define PCI_EXP_ROM_BAR 0x30 #define PCI_EXP_ROM_BAR 0x30
#define PCI_INT_GNT_LAT 0x3c #define PCI_INT_GNT_LAT 0x3c
u_int32_t base0; uint32_t base0;
u_int32_t base1; uint32_t base1;
u_int32_t romaddr; uint32_t romaddr;
u_int32_t pci_command; uint32_t pci_command;
u_int32_t pci_int_lat; uint32_t pci_int_lat;
u_int32_t pci_cache_lat; uint32_t pci_cache_lat;
if (state != PCI_PMCSR_STATE_D3) if (state != PCI_PMCSR_STATE_D3)
return 0; return 0;