Remove firmware-IDs

[b43-tools.git] / fwcutter / fwcutter.h

diff --git a/fwcutter/fwcutter.h b/fwcutter/fwcutter.h
index ac2df63ceb217ac47615aac77951f249d03cf66c..c6d3c3fc4a5ea3e2a0c336664f99a26f6b61ce92 100644 (file)
--- a/fwcutter/fwcutter.h
+++ b/fwcutter/fwcutter.h
@@ -9,10 +9,13 @@
 #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__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 #define bswap_16       bswap16
 #define bswap_32       bswap32
 #endif
@@ -65,7 +68,6 @@ struct extract {
 
 struct file {
        const char *name;
-       const char *id;
        const char *ucode_version;
        const char *md5;
        const struct extract *extract;