0.12beta6, added include <version.h> for 2.6.x, fixed firmware download file names, prepared Makefile for fw download config

9 files changed, 37 insertions, 23 deletions

diff --git a/Makefile b/Makefile
index 9074353..85e6353 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-#$Id: Makefile,v 1.21 2004/01/10 20:31:17 jal2 Exp $
+#$Id: Makefile,v 1.22 2004/01/17 12:15:44 jal2 Exp $
 
-VERSION = 0.12beta5
+VERSION = 0.12beta6
 
 CC=gcc
 
@@ -8,6 +8,10 @@ KERNEL_VERSION = $(shell uname -r)
 
 KERNEL_SRC = /lib/modules/$(KERNEL_VERSION)/build
 KERNEL_HEADERS = $(KERNEL_SRC)/include
+FW_DL=
+
+# uncomment to compile for firmware download from user space
+#FW_DL += -DCONFIG_AT76C503_FIRMWARE_DOWNLOAD
 
 MODULES = at76c503.o usbdfu.o at76c503-i3861.o at76c503-rfmd.o at76c503-rfmd-acc.o \
           at76c505-rfmd.o at76c503-i3863.o at76c505-rfmd2958.o
@@ -49,7 +53,7 @@ modules:
 	mkdir -p .tmp_versions
 	-cp $(KERNEL_SRC)/.tmp_versions/*.mod $(MODVERDIR)
 	$(MAKE) -C $(KERNEL_SRC) SUBDIRS=$(SRCDIR) MODVERDIR=$(MODVERDIR) \
-		EXTRA_CFLAGS="-g -DDRIVER_VERSION=\\\"v$(VERSION)\\\"" modules
+		EXTRA_CFLAGS="-g -DDRIVER_VERSION=\\\"v$(VERSION)\\\" $(FW_DL)" modules
 
 install: all
 	mkdir -p $(MODULE_DIR)
@@ -67,6 +71,7 @@ CPPFLAGS = -D__KERNEL__ \
 	-DDRIVER_VERSION=\"v$(VERSION)\" \
 	-I$(KERNEL_HEADERS)
 CFLAGS = -O2 -Wall -Wstrict-prototypes -pipe -fno-strict-aliasing \
+	 $(FW_DL) \
          -fno-common -Wno-sign-compare -Wno-unused
 
 MODVER = $(shell if cat $(KERNEL_HEADERS)/linux/autoconf.h 2>/dev/null | \
diff --git a/at76c503-fw_skel.c b/at76c503-fw_skel.c
index 3066468..568864c 100644
--- a/at76c503-fw_skel.c
+++ b/at76c503-fw_skel.c
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- */
 /*
- * $Id: at76c503-fw_skel.c,v 1.3 2004/01/10 20:31:17 jal2 Exp $
+ * $Id: at76c503-fw_skel.c,v 1.4 2004/01/17 12:15:44 jal2 Exp $
  *
  * Driver for at76c503-based devices based on the Atmel "Fast-Vnet" reference
  *
@@ -120,6 +120,9 @@ static int at76c50x_probe(struct usb_interface *interface,
 				dbg("got it.");
 			} else {
 				err("firmware " FW_NAME " not found.");
+				err("You may need to download the firmware from "
+				    "http://www.thekelleys.org.uk/atmel or"
+				    "ftp://ftp.berlios.de/pub/at76c503a/firmware/");
 				RETERR(-EFAULT);
 			}
 		} else
diff --git a/at76c503-i3861.c b/at76c503-i3861.c
index 9e5a2c4..3d7beb1 100644
--- a/at76c503-i3861.c
+++ b/at76c503-i3861.c
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- */
 /*
- * $Id: at76c503-i3861.c,v 1.16 2004/01/17 11:14:11 jal2 Exp $
+ * $Id: at76c503-i3861.c,v 1.17 2004/01/17 12:15:44 jal2 Exp $
  *
  * Driver for at76c503-based devices based on the Atmel "Fast-Vnet" reference
  * design using Intersil 3861 radio chips
@@ -24,6 +24,7 @@
  *
  */
 
+#include <linux/version.h>
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/usb.h>
@@ -49,7 +50,7 @@
 #define DRIVER_DESC "Atmel at76c503 (i3861) Wireless LAN Driver"
 
 /* firmware name to load if above include file contains empty fw only */
-#define FW_NAME DRIVER_NAME "-fw"
+#define FW_NAME "atmel_" DRIVER_NAME ".bin"
 
 #define BOARDTYPE BOARDTYPE_503_INTERSIL_3861
 
diff --git a/at76c503-i3863.c b/at76c503-i3863.c
index 84c2645..e394b2c 100644
--- a/at76c503-i3863.c
+++ b/at76c503-i3863.c
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- */
 /*
- * $Id: at76c503-i3863.c,v 1.8 2004/01/17 11:14:11 jal2 Exp $
+ * $Id: at76c503-i3863.c,v 1.9 2004/01/17 12:15:44 jal2 Exp $
  *
  * Driver for at76c503-based devices based on the Atmel "Fast-Vnet" reference
  * design using a Intersil 3863 radio chip
@@ -23,6 +23,7 @@
  * at76c503.
  */
 
+#include <linux/version.h>
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/usb.h>
@@ -50,7 +51,7 @@
 #define BOARDTYPE BOARDTYPE_503_INTERSIL_3863
 
 /* firmware name to load if above include file contains empty fw only */
-#define FW_NAME DRIVER_NAME "-fw"
+#define FW_NAME "atmel_" DRIVER_NAME ".bin"
 
 #define VENDOR_ID_ATMEL               0x03eb
 #define PRODUCT_ID_ATMEL_503_I3863    0x7604 /* Generic AT76C503/3863 device */
diff --git a/at76c503-rfmd-acc.c b/at76c503-rfmd-acc.c
index 2c37b0a..877a2e2 100644
--- a/at76c503-rfmd-acc.c
+++ b/at76c503-rfmd-acc.c
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- */
 /*
- * $Id: at76c503-rfmd-acc.c,v 1.8 2004/01/17 11:14:11 jal2 Exp $
+ * $Id: at76c503-rfmd-acc.c,v 1.9 2004/01/17 12:15:44 jal2 Exp $
  *
  * Driver for at76c503-based devices based on the Atmel "Fast-Vnet" reference
  * design using RFMD radio chips in the Accton OEM layout.
@@ -24,6 +24,7 @@
  *
  */
 
+#include <linux/version.h>
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/usb.h>
@@ -49,7 +50,7 @@
 #define DRIVER_DESC "Atmel at76c503 (RFMD/Accton) Wireless LAN Driver"
 
 /* firmware name to load if above include file contains empty fw only */
-#define FW_NAME DRIVER_NAME "-fw"
+#define FW_NAME "atmel_" DRIVER_NAME ".bin"
 
 #define BOARDTYPE BOARDTYPE_503_RFMD_ACC
 
diff --git a/at76c503-rfmd.c b/at76c503-rfmd.c
index 280f579..110bdee 100644
--- a/at76c503-rfmd.c
+++ b/at76c503-rfmd.c
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- */
 /*
- * $Id: at76c503-rfmd.c,v 1.20 2004/01/17 11:14:11 jal2 Exp $
+ * $Id: at76c503-rfmd.c,v 1.21 2004/01/17 12:15:45 jal2 Exp $
  *
  * Driver for at76c503-based devices based on the Atmel "Fast-Vnet" reference
  * design using RFMD radio chips
@@ -33,6 +33,7 @@
  * - Changed default netdev name to "wlan%d"
  */
 
+#include <linux/version.h>
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/usb.h>
@@ -58,7 +59,7 @@
 #define DRIVER_DESC "Atmel at76c503 (RFMD) Wireless LAN Driver"
 
 /* firmware name to load if above include file contains empty fw only */
-#define FW_NAME DRIVER_NAME "-fw"
+#define FW_NAME "atmel_" DRIVER_NAME ".bin"
 
 #define BOARDTYPE BOARDTYPE_503_RFMD
 
diff --git a/at76c505-rfmd.c b/at76c505-rfmd.c
index 6ee4da5..5cd9be8 100644
--- a/at76c505-rfmd.c
+++ b/at76c505-rfmd.c
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- */
 /*
- * $Id: at76c505-rfmd.c,v 1.10 2004/01/17 11:14:11 jal2 Exp $
+ * $Id: at76c505-rfmd.c,v 1.11 2004/01/17 12:15:45 jal2 Exp $
  *
  * Driver for at76c503-based devices based on the Atmel "Fast-Vnet" reference
  * design using at76c505 with RFMD radio chips
@@ -23,6 +23,7 @@
  * at76c503.
  */
 
+#include <linux/version.h>
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/usb.h>
@@ -50,7 +51,7 @@
 #define BOARDTYPE BOARDTYPE_505_RFMD
 
 /* firmware name to load if above include file contains empty fw only */
-#define FW_NAME DRIVER_NAME "-fw"
+#define FW_NAME "atmel_" DRIVER_NAME ".bin"
 
 /* USB Device IDs supported by this driver */
 
diff --git a/at76c505-rfmd2958.c b/at76c505-rfmd2958.c
index a6d774b..7d394ee 100644
--- a/at76c505-rfmd2958.c
+++ b/at76c505-rfmd2958.c
@@ -23,6 +23,7 @@
  * firmware to the device before handing it off to at76c503.
  */
 
+#include <linux/version.h>
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/usb.h>
@@ -48,7 +49,7 @@
 #define DRIVER_DESC "Atmel at76c505 (RFMD 2958) Wireless LAN Driver"
 
 /* firmware name to load if above include file contains empty fw only */
-#define FW_NAME DRIVER_NAME "-fw"
+#define FW_NAME "atmel_" DRIVER_NAME ".bin"
 
 #define BOARDTYPE BOARDTYPE_505_RFMD_2958
 
diff --git a/gen_fw.c b/gen_fw.c
index b4fbe7f..5599b84 100644
--- a/gen_fw.c
+++ b/gen_fw.c
@@ -1,4 +1,4 @@
-/* $Id: gen_fw.c,v 1.4 2003/12/27 00:03:35 jal2 Exp $ */
+/* $Id: gen_fw.c,v 1.5 2004/01/17 12:15:45 jal2 Exp $ */
 
 /* This file includes the old style firmwares and outputs new, binary files. */
 
@@ -67,43 +67,43 @@ struct fw {
 	u8 *extfw;
 	u32 extfw_sz;
 } fws[] = {
-	{ "at76c503-rfmd-0.90.2-140-fw", BOARDTYPE_503_RFMD,
+	{ "atmel_at76c503-rfmd-0.90.2-140.bin", BOARDTYPE_503_RFMD,
 	  0x01650054, "0.90.2-140 503 RFMD "
 	  "Copyright (c) 1999-2000 by Atmel Corporation",
 	  intfw_503rfmd_0_90_2, sizeof(intfw_503rfmd_0_90_2),
           extfw_503rfmd_0_90_2, sizeof(extfw_503rfmd_0_90_2)},
 
-	{ "at76c503-rfmd-fw", BOARDTYPE_503_RFMD,
+	{ "atmel_at76c503-rfmd.bin", BOARDTYPE_503_RFMD,
 	  0x01650054, "1.101.0-84 503 RFMD "
 	  "Copyright (c) 1999-2000 by Atmel Corporation",
 	  intfw_503rfmd, sizeof(intfw_503rfmd),
 	  extfw_503rfmd, sizeof(extfw_503rfmd)},
 
-	{ "at76c503-rfmd-acc-fw", BOARDTYPE_503_RFMD_ACC,
+	{ "atmel_at76c503-rfmd-acc.bin", BOARDTYPE_503_RFMD_ACC,
 	  0x01650054, "1.101.0-84 503 RFMD Accton design "
 	  "Copyright (c) 1999-2000 by Atmel Corporation",
 	  intfw_503rfmd_acc, sizeof(intfw_503rfmd_acc),
 	  extfw_503rfmd_acc, sizeof(extfw_503rfmd_acc)},
 
-	{ "at76c503-i3861-fw", BOARDTYPE_503_INTERSIL_3861,
+	{ "atmel_at76c503-i3861.bin", BOARDTYPE_503_INTERSIL_3861,
 	  0x005a002c, "0.90.0-44 Intersil 3861 "
 	  "Copyright (c) 1999-2000 by Atmel Corporation",
 	  intfw_i3861, sizeof(intfw_i3861),
 	  extfw_i3861, sizeof(extfw_i3861)},
 
-	{ "at76c503-i3863-fw", BOARDTYPE_503_INTERSIL_3863,
+	{ "atmel_at76c503-i3863.bin", BOARDTYPE_503_INTERSIL_3863,
 	  0x005a002c, "0.90.0-44 Intersil 3863 "
 	  "Copyright (c) 1999-2000 by Atmel Corporation",
 	  intfw_i3863, sizeof(intfw_i3863),
 	  extfw_i3863, sizeof(extfw_i3863)},
 
-	{ "at76c505-rfmd-fw", BOARDTYPE_505_RFMD,
+	{ "atmel_at76c505-rfmd.bin", BOARDTYPE_505_RFMD,
 	  0x005b0004, "0.91.0-4 505 RFMD "
 	  "Copyright (c) 1999-2000 by Atmel Corporation",
 	  intfw_505rfmd, sizeof(intfw_505rfmd),
 	  extfw_505rfmd, sizeof(extfw_505rfmd)},
 
-	{ "at76c505-rfmd2958-fw", BOARDTYPE_505_RFMD_2958,
+	{ "atmel_at76c505-rfmd2958.bin", BOARDTYPE_505_RFMD_2958,
 	  0x01650056, "1.101.0-86 505 RFMD2958 "
 	  "Copyright (c) 1999-2000 by Atmel Corporation",
 	  intfw_505rfmd2958, sizeof(intfw_505rfmd2958),