Module Name: src
Committed By: skrll
Date: Mon Nov 8 23:10:24 UTC 2010
Modified Files:
src/sys/arch/hp700/dev: dino.c elroy.c
Log Message:
Fix the count usage of various bus_space methods that take a count.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/hp700/dev/dino.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hp700/dev/elroy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/dev/dino.c
diff -u src/sys/arch/hp700/dev/dino.c:1.25 src/sys/arch/hp700/dev/dino.c:1.26
--- src/sys/arch/hp700/dev/dino.c:1.25 Sat Mar 6 16:57:00 2010
+++ src/sys/arch/hp700/dev/dino.c Mon Nov 8 23:10:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dino.c,v 1.25 2010/03/06 16:57:00 skrll Exp $ */
+/* $NetBSD: dino.c,v 1.26 2010/11/08 23:10:24 skrll Exp $ */
/* $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.25 2010/03/06 16:57:00 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.26 2010/11/08 23:10:24 skrll Exp $");
/* #include "cardbus.h" */
@@ -955,7 +955,6 @@
p++;
}
- c /= 2;
while (c--)
*a++ = *p;
}
@@ -977,7 +976,6 @@
p = (volatile uint32_t *)&r->pci_io_data;
}
- c /= 4;
while (c--)
*a++ = *p;
}
@@ -1008,7 +1006,6 @@
p++;
}
- c /= 2;
while (c--)
*p = *a++;
}
@@ -1030,7 +1027,6 @@
p = (volatile uint32_t *)&r->pci_io_data;
}
- c /= 4;
while (c--)
*p = *a++;
}
@@ -1206,7 +1202,6 @@
{
volatile uint16_t *p;
- c /= 2;
h += o;
if (h & HPPA_IOSPACE) {
p = (volatile uint16_t *)h;
@@ -1232,7 +1227,6 @@
{
volatile uint32_t *p;
- c /= 4;
h += o;
if (h & HPPA_IOSPACE) {
p = (volatile uint32_t *)h;
@@ -1262,7 +1256,6 @@
{
volatile uint16_t *p;
- c /= 2;
h += o;
if (h & HPPA_IOSPACE) {
p = (volatile uint16_t *)h;
Index: src/sys/arch/hp700/dev/elroy.c
diff -u src/sys/arch/hp700/dev/elroy.c:1.9 src/sys/arch/hp700/dev/elroy.c:1.10
--- src/sys/arch/hp700/dev/elroy.c:1.9 Sat Apr 3 08:01:42 2010
+++ src/sys/arch/hp700/dev/elroy.c Mon Nov 8 23:10:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: elroy.c,v 1.9 2010/04/03 08:01:42 skrll Exp $ */
+/* $NetBSD: elroy.c,v 1.10 2010/11/08 23:10:24 skrll Exp $ */
/* $OpenBSD: elroy.c,v 1.5 2009/03/30 21:24:57 kettenis Exp $ */
@@ -706,7 +706,6 @@
h += o;
p = (volatile uint16_t *)h;
- c /= 2;
while (c--)
*q++ = *p;
}
@@ -719,7 +718,6 @@
h += o;
p = (volatile uint32_t *)h;
- c /= 4;
while (c--)
*q++ = *p;
}
@@ -732,7 +730,6 @@
h += o;
p = (volatile uint64_t *)h;
- c /= 8;
while (c--)
*q++ = *p;
}
@@ -746,7 +743,6 @@
h += o;
p = (volatile uint16_t *)h;
- c /= 2;
while (c--)
*p = *q++;
}
@@ -760,7 +756,6 @@
h += o;
p = (volatile uint32_t *)h;
- c /= 4;
while (c--)
*p = *q++;
}
@@ -774,7 +769,6 @@
h += o;
p = (volatile uint64_t *)h;
- c /= 8;
while (c--)
*p = *q++;
}
@@ -885,7 +879,6 @@
{
volatile uint16_t *p, *q = a;
- c /= 2;
h += o;
p = (volatile uint16_t *)h;
while (c--)
@@ -898,7 +891,6 @@
{
volatile uint32_t *p, *q = a;
- c /= 4;
h += o;
p = (volatile uint32_t *)h;
while (c--)
@@ -911,7 +903,6 @@
{
volatile uint64_t *p, *q = a;
- c /= 8;
h += o;
p = (volatile uint64_t *)h;
while (c--)
@@ -925,7 +916,6 @@
volatile uint16_t *p;
const uint16_t *q = a;
- c /= 2;
h += o;
p = (volatile uint16_t *)h;
while (c--)
@@ -939,7 +929,6 @@
volatile uint32_t *p;
const uint32_t *q = a;
- c /= 4;
h += o;
p = (volatile uint32_t *)h;
while (c--)
@@ -953,7 +942,6 @@
volatile uint64_t *p;
const uint64_t *q = a;
- c /= 8;
h += o;
p = (volatile uint64_t *)h;
while (c--)
