From 393c81691c27f895a0deea04778157cffa242360 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sat, 28 Jun 2008 20:57:30 -0300 Subject: [PATCH] --- yaml --- r: 103901 b: refs/heads/master c: 1a3932e0ed9ca46db2b76ce067e4ebaf04d91ea1 h: refs/heads/master i: 103899: ba95574190efdd942e22bd105c93831c0c819c24 v: v3 --- [refs] | 2 +- trunk/Documentation/video4linux/cx18.txt | 12 +++--------- trunk/drivers/media/video/cx18/cx18-firmware.c | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index e92644846432..ab0191654865 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86d674a1324cce5708b1b84e4ae162910e201b4f +refs/heads/master: 1a3932e0ed9ca46db2b76ce067e4ebaf04d91ea1 diff --git a/trunk/Documentation/video4linux/cx18.txt b/trunk/Documentation/video4linux/cx18.txt index ecab5a06bd74..914cb7e734a2 100644 --- a/trunk/Documentation/video4linux/cx18.txt +++ b/trunk/Documentation/video4linux/cx18.txt @@ -23,14 +23,8 @@ encoder chip: Firmware: -The firmware needs to be extracted from the Windows Hauppauge HVR-1600 -driver, available here: +You can obtain the firmware files here: -http://hauppauge.lightpath.net/software/install_cd/hauppauge_cd_3.4d1.zip +http://dl.ivtvdriver.org/ivtv/firmware/cx18-firmware.tar.gz -Unzip, then copy the following files to the firmware directory -and rename them as follows: - -Drivers/Driver18/hcw18apu.rom -> v4l-cx23418-apu.fw -Drivers/Driver18/hcw18enc.rom -> v4l-cx23418-cpu.fw -Drivers/Driver18/hcw18mlC.rom -> v4l-cx23418-dig.fw +Untar and copy the .fw files to your firmware directory. diff --git a/trunk/drivers/media/video/cx18/cx18-firmware.c b/trunk/drivers/media/video/cx18/cx18-firmware.c index 02453f09693f..2d630d9f7496 100644 --- a/trunk/drivers/media/video/cx18/cx18-firmware.c +++ b/trunk/drivers/media/video/cx18/cx18-firmware.c @@ -87,7 +87,7 @@ #define CX18_DSP0_INTERRUPT_MASK 0xd0004C /* Encoder/decoder firmware sizes */ -#define CX18_FW_CPU_SIZE (174716) +#define CX18_FW_CPU_SIZE (158332) #define CX18_FW_APU_SIZE (141200) #define APU_ROM_SYNC1 0x6D676553 /* "mgeS" */