projects
/
b43-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
b43-asm: Fix some dependency issues
[b43-tools.git]
/
fwcutter
/
fwcutter.c
diff --git
a/fwcutter/fwcutter.c
b/fwcutter/fwcutter.c
index 79e351f6dd4c3ca5ff297bd301f7c497b614117b..20337589192761ae17b351f9bbd4d488d242f85e 100644
(file)
--- a/
fwcutter/fwcutter.c
+++ b/
fwcutter/fwcutter.c
@@
-2,7
+2,7
@@
* firmware cutter for broadcom 43xx wireless driver files
*
* Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
* firmware cutter for broadcom 43xx wireless driver files
*
* Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
- * 2005-2007 Michael Buesch <m
b@bu3sch.de
>
+ * 2005-2007 Michael Buesch <m
@bues.ch
>
* 2005 Alex Beregszaszi
* 2007 Johannes Berg <johannes@sipsolutions.net>
*
* 2005 Alex Beregszaszi
* 2007 Johannes Berg <johannes@sipsolutions.net>
*
@@
-38,7
+38,7
@@
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/types.h>
-#if
def __DragonFly__
+#if
defined(__DragonFly__) || defined(__FreeBSD__)
#include <sys/endian.h>
#else
#include <byteswap.h>
#include <sys/endian.h>
#else
#include <byteswap.h>
@@
-48,7
+48,7
@@
#include "fwcutter.h"
#include "fwcutter_list.h"
#include "fwcutter.h"
#include "fwcutter_list.h"
-#if
def __DragonFly__
+#if
defined(__DragonFly__) || defined(__FreeBSD__)
#define V3_FW_DIRNAME "v3"
#define V4_FW_DIRNAME "v4"
#else
#define V3_FW_DIRNAME "v3"
#define V4_FW_DIRNAME "v4"
#else
@@
-425,8
+425,6
@@
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->ucode_version);
if (strlen(file->ucode_version) < 8) printf("\t");
- printf("%s\t", file->id);
-
printf("%s\n", file->md5);
}
printf("%s\n", file->md5);
}
@@
-437,15
+435,10
@@
static void print_supported_files(void)
print_banner();
printf("\nExtracting firmware is possible "
"from these binary driver files.\n"
print_banner();
printf("\nExtracting firmware is possible "
"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"
"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 < ARRAY_SIZE(files); i++)
"<MD5 checksum>\n\n");
/* print for legacy driver first */
for (i = 0; i < ARRAY_SIZE(files); i++)
@@
-481,7
+474,6
@@
static const struct file *find_file(FILE *fd)
if (file_ok(&files[i]) &&
strcasecmp(md5sig, files[i].md5) == 0) {
printf("This file is recognised as:\n");
if (file_ok(&files[i]) &&
strcasecmp(md5sig, files[i].md5) == 0) {
printf("This file is recognised as:\n");
- printf(" ID : %s\n", files[i].id);
printf(" filename : %s\n", files[i].name);
printf(" version : %s\n", files[i].ucode_version);
printf(" MD5 : %s\n", files[i].md5);
printf(" filename : %s\n", files[i].name);
printf(" version : %s\n", files[i].ucode_version);
printf(" MD5 : %s\n", files[i].md5);