TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V4L: cx88-blackbird: allow usage of 376836 and 262144 sized firmware images

Browse Source 
This updates the cx88-blackbird driver to be able to use the new cx23416
firmware image released by Hauppauge Computer Works, while retaining
compatibility with the older firmware images.
cx2341x firmware can be downloaded at: http://dl.ivtvdriver.org/ivtv/firmware/

(cherry picked from commit af70dbd334)

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Michael Krufky
2007-03-03 09:36:15 -05:00
committed by Greg Kroah-Hartman
parent 943918d8b5
commit d8effd3897
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/media/video/cx88/cx88-blackbird.c
+9 -5
View File
@@ -53,7 +53,8 @@ MODULE_PARM_DESC(debug,"enable debug messages [blackbird]");
/* ------------------------------------------------------------------ */
#define BLACKBIRD_FIRM_IMAGE_SIZE 256*1024
#define OLD_BLACKBIRD_FIRM_IMAGE_SIZE 262144
#define BLACKBIRD_FIRM_IMAGE_SIZE 376836
/* defines below are from ivtv-driver.h */
@@ -401,7 +402,7 @@ static int blackbird_find_mailbox(struct cx8802_dev *dev)
u32 value;
int i;
for (i = 0; i < BLACKBIRD_FIRM_IMAGE_SIZE; i++) {
for (i = 0; i < dev->fw_size; i++) {
memory_read(dev->core, i, &value);
if (value == signature[signaturecnt])
signaturecnt++;
@@ -449,12 +450,15 @@ static int blackbird_load_firmware(struct cx8802_dev *dev)
return -1;
}
if (firmware->size != BLACKBIRD_FIRM_IMAGE_SIZE) {
dprintk(0, "ERROR: Firmware size mismatch (have %zd, expected %d)\n",
firmware->size, BLACKBIRD_FIRM_IMAGE_SIZE);
if ((firmware->size != BLACKBIRD_FIRM_IMAGE_SIZE) &&
(firmware->size != OLD_BLACKBIRD_FIRM_IMAGE_SIZE)) {
dprintk(0, "ERROR: Firmware size mismatch (have %zd, expected %d or %d)\n",
firmware->size, BLACKBIRD_FIRM_IMAGE_SIZE,
OLD_BLACKBIRD_FIRM_IMAGE_SIZE);
release_firmware(firmware);
return -1;
}
dev->fw_size = firmware->size;
if (0 != memcmp(firmware->data, magic, 8)) {
dprintk(0, "ERROR: Firmware magic mismatch, wrong file?\n");
drivers/media/video/cx88/cx88.h
+1
View File
@@ -459,6 +459,7 @@ struct cx8802_dev {
u32 mailbox;
int width;
int height;
int fw_size;
/* for dvb only */
struct videobuf_dvb dvb;