Hi Jeff,
Change: pdc2027x: move the PLL counter reading code to a separate function.
Attached please find the patch 3/4 against the libata-dev-2.6 tree for your review. Thanks.
Albert
Signed-off-by: Albert Lee <[EMAIL PROTECTED]>
--- libata-dev-2.6-059/drivers/scsi/pata_pdc2027x.c 2005-04-11
15:04:32.000000000 +0800
+++ libata-dev-2.6-reorg/drivers/scsi/pata_pdc2027x.c 2005-04-11
15:05:28.000000000 +0800
@@ -455,6 +455,33 @@
}
/**
+ * pdc_read_counter - Read the ctr counter
+ * @probe_ent: for the port address
+ */
+
+static unsigned long pdc_read_counter(struct ata_probe_ent *probe_ent)
+{
+ u8 ctr0, ctr1, ctr2, ctr3;
+ unsigned long counter;
+
+ outb(0x20, probe_ent->port[0].bmdma_addr + 0x01);
+ ctr0 = inb(probe_ent->port[0].bmdma_addr + 0x03);
+ outb(0x21, probe_ent->port[0].bmdma_addr + 0x01);
+ ctr1 = inb(probe_ent->port[0].bmdma_addr + 0x03);
+ outb(0x20, probe_ent->port[1].bmdma_addr + 0x01);
+ ctr2 = inb(probe_ent->port[1].bmdma_addr + 0x03);
+ outb(0x21, probe_ent->port[1].bmdma_addr + 0x01);
+ ctr3 = inb(probe_ent->port[1].bmdma_addr + 0x03);
+
+ counter = (ctr3 << 23) | (ctr2 << 15) | (ctr1 << 8) | ctr0;
+
+ PDPRINTK("ctr0[%X] ctr1[%X] ctr2[%X] ctr3[%X]\n",
+ ctr0, ctr1, ctr2, ctr3);
+
+ return counter;
+}
+
+/**
* adjust_pll - Adjust the PLL input clock in Hz.
*
* @pdc_controller: controller specific information
@@ -550,6 +577,7 @@
return;
}
+
/**
* detect_pll_input_clock - Detect the PLL input clock in Hz.
* @probe_ent: for the port address
@@ -559,28 +587,11 @@
static long pdc_detect_pll_input_clock(struct ata_probe_ent *probe_ent)
{
u8 scr1;
- unsigned long ctr0;
- unsigned long ctr1;
- unsigned long ctr2 = 0;
- unsigned long ctr3 = 0;
-
unsigned long start_count, end_count;
long pll_clock;
/* Read current counter value */
- outb(0x20, probe_ent->port[0].bmdma_addr + 0x01);
- ctr0 = inb(probe_ent->port[0].bmdma_addr + 0x03);
- outb(0x21, probe_ent->port[0].bmdma_addr + 0x01);
- ctr1 = inb(probe_ent->port[0].bmdma_addr + 0x03);
-
- outb(0x20, probe_ent->port[1].bmdma_addr + 0x01);
- ctr2 = inb(probe_ent->port[1].bmdma_addr + 0x03);
- outb(0x21, probe_ent->port[1].bmdma_addr + 0x01);
- ctr3 = inb(probe_ent->port[1].bmdma_addr + 0x03);
-
- start_count = (ctr3 << 23 ) | (ctr2 << 15) | (ctr1 << 8) | ctr0;
-
- PDPRINTK("ctr0[%lX] ctr1[%lX] ctr2 [%lX] ctr3 [%lX]\n", ctr0, ctr1,
ctr2, ctr3);
+ start_count = pdc_read_counter(probe_ent);
/* Start the test mode */
outb(0x01, probe_ent->port[0].bmdma_addr + 0x01);
@@ -592,19 +603,7 @@
udelay(1000);
/* Read the counter values again */
- outb(0x20, probe_ent->port[0].bmdma_addr + 0x01);
- ctr0 = inb(probe_ent->port[0].bmdma_addr + 0x03);
- outb(0x21, probe_ent->port[0].bmdma_addr + 0x01);
- ctr1 = inb(probe_ent->port[0].bmdma_addr + 0x03);
-
- outb(0x20, probe_ent->port[1].bmdma_addr + 0x01);
- ctr2 = inb(probe_ent->port[1].bmdma_addr + 0x03);
- outb(0x21, probe_ent->port[1].bmdma_addr + 0x01);
- ctr3 = inb(probe_ent->port[1].bmdma_addr + 0x03);
-
- end_count = (ctr3 << 23 ) | (ctr2 << 15) | (ctr1 << 8) | ctr0;
-
- PDPRINTK("ctr0[%lX] ctr1[%lX] ctr2 [%lX] ctr3 [%lX]\n", ctr0, ctr1,
ctr2, ctr3);
+ end_count = pdc_read_counter(probe_ent);
/* Stop the test mode */
outb(0x01, probe_ent->port[0].bmdma_addr + 0x01);
