---

yaml --- r: 61342 b: refs/heads/master c: e7d11ec h: refs/heads/master v: v3
git-mirror · Jul 18, 2007 · 95a1eb9 · 95a1eb9
1 parent de0e19c
commit 95a1eb9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39cf1e810a6b464a8469bf318f21206d84ffb1d8
+refs/heads/master: e7d11ecbde987e56845cff012b4a28d7001667b8
diff --git a/trunk/drivers/media/video/cx88/cx88-input.c b/trunk/drivers/media/video/cx88/cx88-input.c
@@ -90,6 +90,9 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
 		auxgpio = cx_read(MO_GP1_IO);
 		/* Take out the parity part */
 		gpio=(gpio & 0x7fd) + (auxgpio & 0xef);
+	} else if (core->board == CX88_BOARD_WINFAST_DTV1000) {
+		gpio = (gpio & 0x6ff) | ((cx_read(MO_GP1_IO) << 8) & 0x900);
+		auxgpio = gpio;
 	} else
 		auxgpio = gpio;
 
@@ -231,6 +234,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
 		ir->polling = 50; /* ms */
 		break;
 	case CX88_BOARD_WINFAST2000XP_EXPERT:
+	case CX88_BOARD_WINFAST_DTV1000:
 		ir_codes = ir_codes_winfast;
 		ir->gpio_addr = MO_GP0_IO;
 		ir->mask_keycode = 0x8f8;