X-Git-Url: https://jxself.org/git/?p=b43-tools.git;a=blobdiff_plain;f=fwcutter%2Ffwcutter.h;h=3b04c66789440eabed4bd6de2737098c2df6458b;hp=783c6b4351dc32f71ad10cd46659c06646d66514;hb=HEAD;hpb=04eb63ab732c826bd3ac4326d7937901f988dc98 diff --git a/fwcutter/fwcutter.h b/fwcutter/fwcutter.h index 783c6b4..3b04c66 100644 --- a/fwcutter/fwcutter.h +++ b/fwcutter/fwcutter.h @@ -15,9 +15,14 @@ typedef uint16_t be16_t; /* Big-endian 16bit */ typedef uint32_t be32_t; /* Big-endian 32bit */ +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 @@ -25,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 { @@ -68,7 +74,6 @@ struct extract { struct file { const char *name; - const char *id; const char *ucode_version; const char *md5; const struct extract *extract; @@ -105,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_ */