From 0ed1d91f9f40755769c79de5a2aff896cf0b2d0e Mon Sep 17 00:00:00 2001 From: Michael Buesch Date: Sat, 9 Feb 2008 00:02:50 +0100 Subject: [PATCH] fwcutter: Add unique firmware IDs Signed-off-by: Michael Buesch --- fwcutter/fwcutter.c | 10 +++++++++- fwcutter/fwcutter.h | 1 + fwcutter/fwcutter_list.h | 5 +++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/fwcutter/fwcutter.c b/fwcutter/fwcutter.c index fb51beb..c4b4af7 100644 --- 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 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("\t" "\t\t" "\t" + "\t" "\n\n"); /* print for legacy driver first */ for (i = 0; i < FILES; i++) diff --git a/fwcutter/fwcutter.h b/fwcutter/fwcutter.h index 2e47073..ac2df63 100644 --- 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 73e7992..dcb185e 100644 --- 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, -- 2.31.1