summaryrefslogtreecommitdiff
path: root/sys/dev/pci
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2006-10-02 02:29:47 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2006-10-02 02:29:47 +0000
commitc515b08943810b367d26c65f6abeca2d4e8d5b64 (patch)
tree527a0fbd0d98fa7517a178e7f0e6e6a4c9818716 /sys/dev/pci
parentbf623a072ce59a756646174a25a931b756f8da00 (diff)
new structure for the firmware blob; ok brad
Diffstat (limited to 'sys/dev/pci')
-rw-r--r--sys/dev/pci/if_bnxreg.h74
1 files changed, 68 insertions, 6 deletions
diff --git a/sys/dev/pci/if_bnxreg.h b/sys/dev/pci/if_bnxreg.h
index 1e4aca719dd..d729576f6c9 100644
--- a/sys/dev/pci/if_bnxreg.h
+++ b/sys/dev/pci/if_bnxreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bnxreg.h,v 1.12 2006/09/20 22:18:23 deraadt Exp $ */
+/* $OpenBSD: if_bnxreg.h,v 1.13 2006/10/02 02:29:46 deraadt Exp $ */
/*-
* Copyright (c) 2006 Broadcom Corporation
@@ -4837,6 +4837,7 @@ struct bnx_softc
u_int32_t unexpected_attentions;
u_int32_t lost_status_block_updates;
#endif
+ pci_intr_handle_t sc_ih;
};
#endif /* _KERNEL */
@@ -4856,11 +4857,72 @@ struct bnx_firmware_header {
int bnx_COM_b06FwBssLen;
u_int32_t bnx_COM_b06FwSbssAddr;
int bnx_COM_b06FwSbssLen;
- u_int32_t bnx_TXP_b06FwData[(0x0/4) + 1];
- u_int32_t bnx_TXP_b06FwRodata[(0x0/4) + 1];
- u_int32_t bnx_TXP_b06FwBss[(0x1c4/4) + 1];
- u_int32_t bnx_TXP_b06FwSbss[(0x38/4) + 1];
- int firmlength;
+
+ int bnx_RXP_b06FwReleaseMajor;
+ int bnx_RXP_b06FwReleaseMinor;
+ int bnx_RXP_b06FwReleaseFix;
+ u_int32_t bnx_RXP_b06FwStartAddr;
+ u_int32_t bnx_RXP_b06FwTextAddr;
+ int bnx_RXP_b06FwTextLen;
+ u_int32_t bnx_RXP_b06FwDataAddr;
+ int bnx_RXP_b06FwDataLen;
+ u_int32_t bnx_RXP_b06FwRodataAddr;
+ int bnx_RXP_b06FwRodataLen;
+ u_int32_t bnx_RXP_b06FwBssAddr;
+ int bnx_RXP_b06FwBssLen;
+ u_int32_t bnx_RXP_b06FwSbssAddr;
+ int bnx_RXP_b06FwSbssLen;
+
+ int bnx_TPAT_b06FwReleaseMajor;
+ int bnx_TPAT_b06FwReleaseMinor;
+ int bnx_TPAT_b06FwReleaseFix;
+ u_int32_t bnx_TPAT_b06FwStartAddr;
+ u_int32_t bnx_TPAT_b06FwTextAddr;
+ int bnx_TPAT_b06FwTextLen;
+ u_int32_t bnx_TPAT_b06FwDataAddr;
+ int bnx_TPAT_b06FwDataLen;
+ u_int32_t bnx_TPAT_b06FwRodataAddr;
+ int bnx_TPAT_b06FwRodataLen;
+ u_int32_t bnx_TPAT_b06FwBssAddr;
+ int bnx_TPAT_b06FwBssLen;
+ u_int32_t bnx_TPAT_b06FwSbssAddr;
+ int bnx_TPAT_b06FwSbssLen;
+
+ int bnx_TXP_b06FwReleaseMajor;
+ int bnx_TXP_b06FwReleaseMinor;
+ int bnx_TXP_b06FwReleaseFix;
+ u_int32_t bnx_TXP_b06FwStartAddr;
+ u_int32_t bnx_TXP_b06FwTextAddr;
+ int bnx_TXP_b06FwTextLen;
+ u_int32_t bnx_TXP_b06FwDataAddr;
+ int bnx_TXP_b06FwDataLen;
+ u_int32_t bnx_TXP_b06FwRodataAddr;
+ int bnx_TXP_b06FwRodataLen;
+ u_int32_t bnx_TXP_b06FwBssAddr;
+ int bnx_TXP_b06FwBssLen;
+ u_int32_t bnx_TXP_b06FwSbssAddr;
+ int bnx_TXP_b06FwSbssLen;
+
+ int bnx_rv2p_proc1len;
+ int bnx_rv2p_proc2len;
+
+ /* Followed by blocks of data, each sized according to
+ * the (rather obvious) block length stated above.
+ *
+ * bnx_COM_b06FwText, bnx_COM_b06FwData, bnx_COM_b06FwRodata,
+ * bnx_COM_b06FwBss, bnx_COM_b06FwSbss,
+ *
+ * bnx_RXP_b06FwText, bnx_RXP_b06FwData, bnx_RXP_b06FwRodata,
+ * bnx_RXP_b06FwBss, bnx_RXP_b06FwSbss,
+ *
+ * bnx_TPAT_b06FwText, bnx_TPAT_b06FwData, bnx_TPAT_b06FwRodata,
+ * bnx_TPAT_b06FwBss, bnx_TPAT_b06FwSbss,
+ *
+ * bnx_TXP_b06FwText, bnx_TXP_b06FwData, bnx_TXP_b06FwRodata,
+ * bnx_TXP_b06FwBss, bnx_TXP_b06FwSbss,
+ *
+ * bnx_rv2p_proc1, bnx_rv2p_proc2
+ */
};
#endif /* #ifndef _BNX_H_DEFINED */