summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorgmcgarry <gmcgarry@NetBSD.org>2008-06-24 10:12:06 +0000
committergmcgarry <gmcgarry@NetBSD.org>2008-06-24 10:12:06 +0000
commit7bb601e861b0fed982a3ecabcf5fe4c712295677 (patch)
treea13f446cff60920eae1c2f37ccb848521f5b170f /sys/dev
parentcb3e0547b7dc1258855f0fcfeb11d5376ea74b49 (diff)
Rearrange pdq_boolean_t, pdq_type_t and pdq_state_t so that enums are defined
before their typedefs and prototypes. Fixes compilation with pcc.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/pdqreg.h18
-rw-r--r--sys/dev/ic/pdqvar.h34
2 files changed, 26 insertions, 26 deletions
diff --git a/sys/dev/ic/pdqreg.h b/sys/dev/ic/pdqreg.h
index 5eac1202ebf..da780ba5a53 100644
--- a/sys/dev/ic/pdqreg.h
+++ b/sys/dev/ic/pdqreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pdqreg.h,v 1.18 2005/12/11 12:21:28 christos Exp $ */
+/* $NetBSD: pdqreg.h,v 1.19 2008/06/24 10:12:06 gmcgarry Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
@@ -81,17 +81,6 @@ typedef struct {
pdq_uint8_t fwrev_bytes[4];
} pdq_fwrev_t;
-enum _pdq_state_t {
- PDQS_RESET=0,
- PDQS_UPGRADE=1,
- PDQS_DMA_UNAVAILABLE=2,
- PDQS_DMA_AVAILABLE=3,
- PDQS_LINK_AVAILABLE=4,
- PDQS_LINK_UNAVAILABLE=5,
- PDQS_HALTED=6,
- PDQS_RING_MEMBER=7
-};
-
struct _pdq_csrs_t {
pdq_bus_memoffset_t csr_port_reset; /* 0x00 [RW] */
pdq_bus_memoffset_t csr_host_data; /* 0x04 [R] */
@@ -583,11 +572,6 @@ typedef enum {
PDQSNMP_FULL_DUPLEX_ENABLE=0x2F11
} pdq_snmp_item_code_t;
-enum _pdq_boolean_t {
- PDQ_FALSE=0,
- PDQ_TRUE=1
-};
-
typedef enum {
PDQ_FILTER_BLOCK=0,
PDQ_FILTER_PASS=1
diff --git a/sys/dev/ic/pdqvar.h b/sys/dev/ic/pdqvar.h
index 8f6a0f8cf54..742d45bccb4 100644
--- a/sys/dev/ic/pdqvar.h
+++ b/sys/dev/ic/pdqvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pdqvar.h,v 1.39 2007/12/20 21:08:18 dyoung Exp $ */
+/* $NetBSD: pdqvar.h,v 1.40 2008/06/24 10:12:06 gmcgarry Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
@@ -39,6 +39,30 @@
#define PDQ_OS_TX_TIMEOUT 5 /* seconds */
+enum _pdq_boolean_t {
+ PDQ_FALSE=0,
+ PDQ_TRUE=1
+};
+
+enum _pdq_type_t {
+ PDQ_DEFPA, /* PCI-bus */
+ PDQ_DEFEA, /* EISA-bus */
+ PDQ_DEFTA, /* TurboChannel */
+ PDQ_DEFAA, /* FutureBus+ */
+ PDQ_DEFQA /* Q-bus */
+};
+
+enum _pdq_state_t {
+ PDQS_RESET=0,
+ PDQS_UPGRADE=1,
+ PDQS_DMA_UNAVAILABLE=2,
+ PDQS_DMA_AVAILABLE=3,
+ PDQS_LINK_AVAILABLE=4,
+ PDQS_LINK_UNAVAILABLE=5,
+ PDQS_HALTED=6,
+ PDQS_RING_MEMBER=7
+};
+
typedef struct _pdq_t pdq_t;
typedef struct _pdq_csrs_t pdq_csrs_t;
typedef struct _pdq_pci_csrs_t pdq_pci_csrs_t;
@@ -50,14 +74,6 @@ typedef enum _pdq_boolean_t pdq_boolean_t;
typedef enum _pdq_type_t pdq_type_t;
typedef enum _pdq_state_t pdq_state_t;
-enum _pdq_type_t {
- PDQ_DEFPA, /* PCI-bus */
- PDQ_DEFEA, /* EISA-bus */
- PDQ_DEFTA, /* TurboChannel */
- PDQ_DEFAA, /* FutureBus+ */
- PDQ_DEFQA /* Q-bus */
-};
-
#if defined(PDQTEST)
#include <pdq_os_test.h>
#elif defined(__FreeBSD__) || defined(__bsdi__) || defined(__NetBSD__)