X-Git-Url: https://jxself.org/git/?p=b43-tools.git;a=blobdiff_plain;f=fwcutter%2Ffwcutter.h;h=3b04c66789440eabed4bd6de2737098c2df6458b;hp=ac2df63ceb217ac47615aac77951f249d03cf66c;hb=HEAD;hpb=0ed1d91f9f40755769c79de5a2aff896cf0b2d0e

diff --git a/fwcutter/fwcutter.h b/fwcutter/fwcutter.h
index ac2df63..3b04c66 100644
--- a/fwcutter/fwcutter.h
+++ b/fwcutter/fwcutter.h
@@ -9,12 +9,20 @@
 #define fwcutter_stringify(x)	fwcutter_stringify_1(x)
 #define FWCUTTER_VERSION	fwcutter_stringify(FWCUTTER_VERSION_)
 
+#undef ARRAY_SIZE
+#define ARRAY_SIZE(array)	(sizeof(array) / sizeof((array)[0]))
+
 typedef uint16_t be16_t; /* Big-endian 16bit */
 typedef uint32_t be32_t; /* Big-endian 32bit */
 
-#ifdef __DragonFly__
+typedef uint32_t le32_t; /* Little-endian 32bit */
+
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 #define bswap_16	bswap16
 #define bswap_32	bswap32
+#elif defined(__APPLE__)
+#define bswap_16	OSSwapInt16
+#define bswap_32	OSSwapInt32
 #endif
 
 #define ARG_MATCH	0
@@ -22,9 +30,10 @@ typedef uint32_t be32_t; /* Big-endian 32bit */
 #define ARG_ERROR	-1
 
 enum fwcutter_mode {
-	FWCM_EXTRACT = 0,	/* default */
+	FWCM_EXTRACT_B43 = 0,	/* default */
 	FWCM_LIST,
 	FWCM_IDENTIFY,
+	FWCM_EXTRACT_BRCMSMAC,
 };
 
 struct cmdline_args {
@@ -65,7 +74,6 @@ struct extract {
 
 struct file {
 	const char *name;
-	const char *id;
 	const char *ucode_version;
 	const char *md5;
 	const struct extract *extract;
@@ -102,5 +110,31 @@ struct b43_iv {
 #define FW_IV_OFFSET_MASK	0x7FFF
 #define FW_IV_32BIT		0x8000
 
+/* header format for brcmsmac firmware */
+struct firmware_hdr {
+	le32_t offset;
+	le32_t len;
+	le32_t idx;
+};
+
+/* numbers of firmware types for brcmsmac firmware */
+enum firmware_brcmsmac {
+	D11UCODE_NAMETAG_START = 0,
+	D11LCN0BSINITVALS24,
+	D11LCN0INITVALS24,
+	D11LCN1BSINITVALS24,
+	D11LCN1INITVALS24,
+	D11LCN2BSINITVALS24,
+	D11LCN2INITVALS24,
+	D11N0ABSINITVALS16,
+	D11N0BSINITVALS16,
+	D11N0INITVALS16,
+	D11UCODE_OVERSIGHT16_MIMO,
+	D11UCODE_OVERSIGHT16_MIMOSZ,
+	D11UCODE_OVERSIGHT24_LCN,
+	D11UCODE_OVERSIGHT24_LCNSZ,
+	D11UCODE_OVERSIGHT_BOMMAJOR,
+	D11UCODE_OVERSIGHT_BOMMINOR
+};
 
 #endif /* _FWCUTTER_H_ */