staging: slicoss-use request_firmware
PATCH 1/1 staging: slicoss-use request_firmware
This patch uses request_firmware() to download the firmware to the card.
It seems that some of my previous patches (including an earlier and not working version of this) are missing from your tree so they are also included here again.
This code is more compact than the original as it reads all the meta data from the firmware file instead of having it hard coded.
In addition some 32/64 bit dependent code was removed.
I was able to test it on an actual board and verify that it indeed works.
If this patch is accepted, I can send a patch to remove the static firmware from the tree.
drivers/staging/slicoss/README +2 -3
@@ -14,6 +14,5 @@ TODO: Please send patches to: Greg Kroah-Hartman <[email protected]> -and Cc: Lior Dotan <[email protected]> and Christopher Harrer -<[email protected]> as well as they are also able to test out any -changes. +and Cc: Christopher Harrer <[email protected]> as well as he is also able +to test out any changes.
drivers/staging/slicoss/slic.h +14 -0
@@ -41,6 +41,20 @@ #ifndef __SLIC_DRIVER_H__ #define __SLIC_DRIVER_H__ +/* firmware stuff */ +#define OASIS_UCODE_VERS_STRING "1.2" +#define OASIS_UCODE_VERS_DATE "2006/03/27 15:10:37" +#define OASIS_UCODE_HOSTIF_ID 3 + +#define MOJAVE_UCODE_VERS_STRING "1.2" +#define MOJAVE_UCODE_VERS_DATE "2006/03/27 15:12:22" +#define MOJAVE_UCODE_HOSTIF_ID 3 + +#define GB_RCVUCODE_VERS_STRING "1.2" +#define GB_RCVUCODE_VERS_DATE "2006/03/27 15:12:15" +static u32 OasisRcvUCodeLen = 512; +static u32 GBRcvUCodeLen = 512; +#define SECTION_SIZE 65536 struct slic_spinlock { spinlock_t lock;
drivers/staging/slicoss/slicoss.c +96 -122
377 lines not on this page · raw message
Quoted 11 lines · Lior Dotan
This patch uses
request_firmware()to download the firmware to the card. It seems that some of my previous patches (including an earlier and not working version of this)
are missing from your tree so they are also included here again. This code is more compact than the original as it reads all the meta data from the firmware
file instead of having it hard coded.
In addition some 32/64 bit dependent code was removed.
I was able to test it on an actual board and verify that it indeed works. If this patch is accepted, I can send a patch to remove the static firmware from the tree.
Hm, this doesn't apply against the latest tree at all. Care to split this up into the different patches which would make it easier for me to apply?
thanks,
greg k-h
-------- Original Message --------
Subject: Re: [PATCH] staging: slicoss-use request_firmware
From: Greg KH <[email protected]>
To: Lior Dotan <[email protected]>
CC: [email protected], [email protected], Christopher Harrer <[email protected]>, 'Mook' <[email protected]>
Date: 01/21/2009 07:11 PM
Quoted 10 lines · Lior Dotan
Quoted 8 lines
This patch uses
request_firmware()to download the firmware to the card.
It seems that some of my previous patches (including an earlier and not working version of this) are missing from your tree so they are also included here again.
This code is more compact than the original as it reads all the meta data from the firmware file instead of having it hard coded.
In addition some 32/64 bit dependent code was removed.
I was able to test it on an actual board and verify that it indeed works.
If this patch is accepted, I can send a patch to remove the static firmware from the tree.
Quoted 7 lines
Hm, this doesn't apply against the latest tree at all. Care to split this up into the different patches which would make it easier for me to apply?
thanks,
greg k-h
It didn't apply because it includec some patches that are already and it also missed some patches, so basically it gotten too old and didn't age well. This new patch applies to the latest Linus' git tree.
drivers/staging/slicoss/slic.h +0 -20
@@ -46,30 +46,10 @@#define OASIS_UCODE_VERS_DATE "2006/03/27 15:10:37"#define OASIS_UCODE_HOSTIF_ID 3 -static s32 ONumSections =0x2 ; -static u32 OSectionSize[] = { -0x00004000 ,0x00010000 , -}; - -static u32 OSectionStart[] = { -0x00000000 ,0x00008000 , -}; -#define MOJAVE_UCODE_VERS_STRING "1.2"#define MOJAVE_UCODE_VERS_DATE "2006/03/27 15:12:22"#define MOJAVE_UCODE_HOSTIF_ID 3 -static s32 MNumSections =0x2 ; -static u32 MSectionSize[] = -{ -0x00008000 ,0x00010000 , -}; - -static u32 MSectionStart[] = -{ -0x00000000 ,0x00008000 , -}; -#define GB_RCVUCODE_VERS_STRING "1.2"#define GB_RCVUCODE_VERS_DATE "2006/03/27 15:12:15"static u32 OasisRcvUCodeLen =512 ;
drivers/staging/slicoss/slicoss.c +58 -112
292 lines not on this page · raw message