summaryrefslogtreecommitdiffstats
path: root/sys/dev/xe/if_xe_pccard.c
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2008-06-04 20:26:57 +0000
committerjhb <jhb@FreeBSD.org>2008-06-04 20:26:57 +0000
commit4b688a59eb900063ae3e4bc89db0f9faee56e0e5 (patch)
treeee2a123604b9893331308da9b0db76f5fb801bf9 /sys/dev/xe/if_xe_pccard.c
parentcb0dec71b19bc769bd89d872587440b3b42697eb (diff)
downloadFreeBSD-src-4b688a59eb900063ae3e4bc89db0f9faee56e0e5.zip
FreeBSD-src-4b688a59eb900063ae3e4bc89db0f9faee56e0e5.tar.gz
Style(9) xe(4). The MD5 sums are different, but comparing the dissassemblies
the only changes are from gcc moving some global variables around slightly.
Diffstat (limited to 'sys/dev/xe/if_xe_pccard.c')
-rw-r--r--sys/dev/xe/if_xe_pccard.c49
1 files changed, 24 insertions, 25 deletions
diff --git a/sys/dev/xe/if_xe_pccard.c b/sys/dev/xe/if_xe_pccard.c
index 039dd90..f60ab1a 100644
--- a/sys/dev/xe/if_xe_pccard.c
+++ b/sys/dev/xe/if_xe_pccard.c
@@ -67,38 +67,37 @@ __FBSDID("$FreeBSD$");
extern int xe_debug;
-#define DEVPRINTF(level, arg) if (xe_debug >= (level)) device_printf arg
-#define DPRINTF(level, arg) if (xe_debug >= (level)) printf arg
+#define DEVPRINTF(level, arg) if (xe_debug >= (level)) device_printf arg
+#define DPRINTF(level, arg) if (xe_debug >= (level)) printf arg
#else
-#define DEVPRINTF(level, arg)
-#define DPRINTF(level, arg)
+#define DEVPRINTF(level, arg)
+#define DPRINTF(level, arg)
#endif
-#define XE_CARD_TYPE_FLAGS_NO 0x0
-#define XE_CARD_TYPE_FLAGS_CE2 0x1
-#define XE_CARD_TYPE_FLAGS_MOHAWK 0x2
-#define XE_CARD_TYPE_FLAGS_DINGO 0x4
-#define XE_PROD_ETHER_MASK 0x0100
-#define XE_PROD_MODEM_MASK 0x1000
+#define XE_CARD_TYPE_FLAGS_NO 0x0
+#define XE_CARD_TYPE_FLAGS_CE2 0x1
+#define XE_CARD_TYPE_FLAGS_MOHAWK 0x2
+#define XE_CARD_TYPE_FLAGS_DINGO 0x4
+#define XE_PROD_ETHER_MASK 0x0100
+#define XE_PROD_MODEM_MASK 0x1000
-#define XE_BOGUS_MAC_OFFSET 0x90
+#define XE_BOGUS_MAC_OFFSET 0x90
/* MAC vendor prefix used by most Xircom cards is 00:80:c7 */
-#define XE_MAC_ADDR_0 0x00
-#define XE_MAC_ADDR_1 0x80
-#define XE_MAC_ADDR_2 0xc7
+#define XE_MAC_ADDR_0 0x00
+#define XE_MAC_ADDR_1 0x80
+#define XE_MAC_ADDR_2 0xc7
/* Some (all?) REM56 cards have vendor prefix 00:10:a4 */
-#define XE_REM56_MAC_ADDR_0 0x00
-#define XE_REM56_MAC_ADDR_1 0x10
-#define XE_REM56_MAC_ADDR_2 0xa4
-
+#define XE_REM56_MAC_ADDR_0 0x00
+#define XE_REM56_MAC_ADDR_1 0x10
+#define XE_REM56_MAC_ADDR_2 0xa4
struct xe_pccard_product {
struct pccard_product product;
- uint16_t prodext;
- uint16_t flags;
+ uint16_t prodext;
+ uint16_t flags;
};
static const struct xe_pccard_product xe_pccard_products[] = {
@@ -126,7 +125,6 @@ static const struct xe_pccard_product xe_pccard_products[] = {
{ { NULL }, 0, 0 }
};
-
/*
* Fixing for CEM2, CEM3 and CEM56/REM56 cards. These need some magic to
* enable the Ethernet function, which isn't mentioned anywhere in the CIS.
@@ -135,7 +133,7 @@ static const struct xe_pccard_product xe_pccard_products[] = {
static int
xe_cemfix(device_t dev)
{
- struct xe_softc *sc = (struct xe_softc *) device_get_softc(dev);
+ struct xe_softc *sc = device_get_softc(dev);
int ioport;
DEVPRINTF(2, (dev, "cemfix\n"));
@@ -164,7 +162,8 @@ xe_cemfix(device_t dev)
}
static int
-xe_pccard_product_match(device_t dev, const struct pccard_product* ent, int vpfmatch)
+xe_pccard_product_match(device_t dev, const struct pccard_product* ent,
+ int vpfmatch)
{
const struct xe_pccard_product* xpp;
uint16_t prodext;
@@ -184,7 +183,7 @@ xe_pccard_product_match(device_t dev, const struct pccard_product* ent, int vpfm
static const struct xe_pccard_product *
xe_pccard_get_product(device_t dev)
{
- return ((const struct xe_pccard_product *) pccard_product_lookup(dev,
+ return ((const struct xe_pccard_product *)pccard_product_lookup(dev,
(const struct pccard_product *)xe_pccard_products,
sizeof(xe_pccard_products[0]), xe_pccard_product_match));
}
@@ -237,7 +236,7 @@ xe_bad_mac(uint8_t *enaddr)
static int
xe_pccard_attach(device_t dev)
{
- struct xe_softc *scp = (struct xe_softc *) device_get_softc(dev);
+ struct xe_softc *scp = device_get_softc(dev);
uint32_t vendor,product;
uint16_t prodext;
const char* vendor_str = NULL;
OpenPOWER on IntegriCloud