---

yaml
---
r: 164138
b: refs/heads/master
c: 1a6450d
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d119c3314cd7ad251e1e2c97b4e081d870a31f7
+refs/heads/master: 1a6450d4d43a4d4caecaa3ca7796cbe8c7cfbba3

trunk/drivers/media/video/saa7164/saa7164-bus.c

@@ -257,7 +257,7 @@ int saa7164_bus_set(struct saa7164_dev *dev, tmComResInfo_t* msg, void *buf)
 
 	dprintk(DBGLVL_BUS, "%s() new_swp = %x\n", __func__, new_swp);
 
-	/* TODO: Convert all of the volatiles and direct PCI writes into
+	/* TODO: Convert all of the direct PCI writes into
 	 * saa7164_writel/b calls for consistency.
 	 */
 

trunk/drivers/media/video/saa7164/saa7164-core.c

@@ -126,12 +126,13 @@ static irqreturn_t saa7164_irq(int irq, void *dev_id)
 	/* Check that the hardware is accessable. If the status bytes are
 	 * 0xFF then the device is not accessable, the the IRQ belongs
 	 * to another driver.
+	 * 4 x u32 interrupt registers.
 	 */
 	for (i = 0; i < INT_SIZE/4; i++) {
 
 		/* TODO: Convert into saa7164_readl() */
 		/* Read the 4 hardware interrupt registers */
-		intstat[i] = *(dev->InterruptStatus + i);
+		intstat[i] = saa7164_readl(dev->int_status + (i * 4));
 
 		if (intstat[i] != 0xffffffff)
 			hwacc = 1;
@@ -184,9 +185,8 @@ static irqreturn_t saa7164_irq(int irq, void *dev_id)
 				}
 			}
 
-			/* TODO: Convert into saa7164_writel() */
 			/* Ack it */
-			*(dev->InterruptAck + i) = intstat[i];
+			saa7164_writel(dev->int_ack + (i * 4), intstat[i]);
 
 		}
 	}
@@ -487,9 +487,9 @@ static int saa7164_dev_setup(struct saa7164_dev *dev)
 	printk(KERN_INFO "CORE %s: dev->bmmio2 = 0x%p\n", dev->name,
 		dev->bmmio2);
 
-	/* TODO: Magic defines used in the windows driver, define these */
-	dev->InterruptStatus = (u32 *)(dev->bmmio + 0x183000 + 0xf80);
-	dev->InterruptAck = (u32 *)(dev->bmmio + 0x183000 + 0xf90);
+	/* Inerrupt and ack register locations offset of bmmio */
+	dev->int_status = 0x183000 + 0xf80;
+	dev->int_ack = 0x183000 + 0xf90;
 
 	printk(KERN_INFO
 		"CORE %s: subsystem: %04x:%04x, board: %s [card=%d,%s]\n",

trunk/drivers/media/video/saa7164/saa7164.h

@@ -274,9 +274,9 @@ struct saa7164_dev {
 
 	tmComResBusInfo_t		bus;
 
-	/* TODO: Urgh, remove volatiles */
-	volatile u32			*InterruptStatus;
-	volatile u32			*InterruptAck;
+	/* Interrupt status and ack registers */
+	u32 int_status;
+	u32 int_ack;
 
 	struct cmd			cmds[SAA_CMD_MAX_MSG_UNITS];
 	struct mutex			lock;