summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2005-09-17 03:54:44 +0000
committerBrad Smith <brad@cvs.openbsd.org>2005-09-17 03:54:44 +0000
commit6861ce3b202c04ea2cc6fef4f4e6042751aefb5d (patch)
tree28729ec5363e0fd36d61973bd77f1e0e9162004a /sys
parent2b31496aeb1173cbe9e0274af630f14b4f8ba501 (diff)
remove VPD bits
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/if_skreg.h30
1 files changed, 1 insertions, 29 deletions
diff --git a/sys/dev/pci/if_skreg.h b/sys/dev/pci/if_skreg.h
index 45b0d0df21b..eeffd4f244f 100644
--- a/sys/dev/pci/if_skreg.h
+++ b/sys/dev/pci/if_skreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_skreg.h,v 1.19 2005/09/17 02:53:10 brad Exp $ */
+/* $OpenBSD: if_skreg.h,v 1.20 2005/09/17 03:54:43 brad Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -1219,10 +1219,6 @@
#define SK_PCI_PWRMGMTCAP 0x004A /* 16 bits */
#define SK_PCI_PWRMGMTCTRL 0x004C /* 16 bits */
#define SK_PCI_PME_EVENT 0x004F
-#define SK_PCI_VPD_CAPID 0x0050
-#define SK_PCI_VPD_NEXTPTR 0x0051
-#define SK_PCI_VPD_ADDR 0x0052
-#define SK_PCI_VPD_DATA 0x0054
#define SK_PSTATE_MASK 0x0003
#define SK_PSTATE_D0 0x0000
@@ -1232,30 +1228,6 @@
#define SK_PME_EN 0x0010
#define SK_PME_STATUS 0x8000
-/*
- * VPD flag bit. Set to 0 to initiate a read, will become 1 when
- * read is complete. Set to 1 to initiate a write, will become 0
- * when write is finished.
- */
-#define SK_VPD_FLAG 0x8000
-
-/* VPD structures */
-struct vpd_res {
- u_int8_t vr_id;
- u_int8_t vr_len;
- u_int8_t vr_pad;
-};
-
-struct vpd_key {
- char vk_key[2];
- u_int8_t vk_len;
-};
-
-#define VPD_RES_ID 0x82 /* ID string */
-#define VPD_RES_READ 0x90 /* start of read only area */
-#define VPD_RES_WRITE 0x81 /* start of read/write area */
-#define VPD_RES_END 0x78 /* end tag */
-
#define CSR_WRITE_4(sc, reg, val) \
bus_space_write_4((sc)->sk_btag, (sc)->sk_bhandle, (reg), (val))
#define CSR_WRITE_2(sc, reg, val) \