fwcutter: Add unique firmware IDs

Signed-off-by: Michael Buesch <mb@bu3sch.de>

diff --git a/fwcutter/fwcutter.c b/fwcutter/fwcutter.c
index fb51beb04df87fd6c4c3c14e909268b5893a4173..c4b4af7674d5b0ee39469295b1b5add6fa4fd130 100644 (file)
--- a/fwcutter/fwcutter.c
+++ b/fwcutter/fwcutter.c
@@ -439,6 +439,8 @@ static void print_file(const struct file *file)
        printf("%s\t", file->ucode_version);
        if (strlen(file->ucode_version) < 8) printf("\t");
 
+       printf("%s\t", file->id);
+
        printf("%s\n", file->md5);
 }
 
@@ -448,10 +450,16 @@ static void print_supported_files(void)
 
        print_banner();
        printf("\nExtracting firmware is possible "
-              "from these binary driver files:\n\n");
+              "from these binary driver files.\n"
+              "The <ID> column shows the unique identifier string "
+              "for your firmware.\nYou must select the firmware with the "
+              "same ID as printed by the kernel driver on modprobe.\n"
+              "Note that only recent drivers print such a message on modprobe.\n"
+              "Please read http://linuxwireless.org/en/users/Drivers/b43#devicefirmware\n\n");
        printf("<driver>\t"
               "<filename>\t\t"
               "<microcode>\t"
+              "<ID>\t"
               "<MD5 checksum>\n\n");
        /* print for legacy driver first */
        for (i = 0; i < FILES; i++)

diff --git a/fwcutter/fwcutter.h b/fwcutter/fwcutter.h
index 2e47073cc7db47def23717b6e33fce13303f659e..ac2df63ceb217ac47615aac77951f249d03cf66c 100644 (file)
--- a/fwcutter/fwcutter.h
+++ b/fwcutter/fwcutter.h
@@ -65,6 +65,7 @@ struct extract {
 
 struct file {
        const char *name;
+       const char *id;
        const char *ucode_version;
        const char *md5;
        const struct extract *extract;

diff --git a/fwcutter/fwcutter_list.h b/fwcutter/fwcutter_list.h
index 73e7992c0b9b3e1259def07b916320b87964f4e9..dcb185e61ed3b007f6f77c29bb883b41732db91d 100644 (file)
--- a/fwcutter/fwcutter_list.h
+++ b/fwcutter/fwcutter_list.h
@@ -165,6 +165,7 @@ static const struct file files[] =
 {
        {
                .name           = "wl_apsta.o",
+               .id             = "FW0",
                .ucode_version  = "295.14",
                .md5            = "e08665c5c5b66beb9c3b2dd54aa80cb3",
                .flags          = FW_FLAG_LE,
@@ -174,6 +175,7 @@ static const struct file files[] =
                /* http://downloads.openwrt.org/sources/broadcom-wl-4.80.53.0.tar.bz2 */
                /* This firmware has the old TX header. */
                .name           = "wl_apsta.o",
+               .id             = "FW1",
                .ucode_version  = "351.126",
                .md5            = "9207bc565c2fc9fa1591f6c7911d3fc0",
                .flags          = FW_FLAG_LE | FW_FLAG_V4 | FW_FLAG_UNSUPPORTED,
@@ -183,6 +185,7 @@ static const struct file files[] =
                /* http://downloads.openwrt.org/sources/broadcom-wl-4.80.53.0.tar.bz2 */
                /* This firmware has the old TX header. */
                .name           = "wl_apsta_mimo.o",
+               .id             = "FW1",
                .ucode_version  = "351.126",
                .md5            = "722e2e0d8cc04b8f118bb5afe6829ff9",
                .flags          = FW_FLAG_LE | FW_FLAG_V4 | FW_FLAG_UNSUPPORTED,
@@ -191,6 +194,7 @@ static const struct file files[] =
        {
                /* ftp://ftp.linksys.com/opensourcecode/wrt150nv11/1.51.3/ */
                .name           = "wl_ap.o",
+               .id             = "FW2",
                .ucode_version  = "410.2160",
                .md5            = "1e4763b4cb8cfbaae43e5c6d3d6b2ae7",
                .flags          = FW_FLAG_LE | FW_FLAG_V4 | FW_FLAG_UNSUPPORTED,
@@ -199,6 +203,7 @@ static const struct file files[] =
        {
                /* http://mirror2.openwrt.org/sources/broadcom-wl-4.150.10.5.tar.bz2 */
                .name           = "wl_apsta_mimo.o",
+               .id             = "FW3",
                .ucode_version  = "410.2160",
                .md5            = "cb8d70972b885b1f8883b943c0261a3c",
                .flags          = FW_FLAG_LE | FW_FLAG_V4,