Module Name: src
Committed By: jakllsch
Date: Sat Nov 21 23:47:01 UTC 2009
Modified Files:
src/sys/dev/ic: ahcisata_core.c
Log Message:
Change bus_space_subregion() size for each SATA PHY register from 1 to 4,
as we do a bus_space_read_4() within these subregions.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/ic/ahcisata_core.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/dev/ic/ahcisata_core.c
diff -u src/sys/dev/ic/ahcisata_core.c:1.21 src/sys/dev/ic/ahcisata_core.c:1.22
--- src/sys/dev/ic/ahcisata_core.c:1.21 Mon Oct 19 18:41:12 2009
+++ src/sys/dev/ic/ahcisata_core.c Sat Nov 21 23:47:01 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_core.c,v 1.21 2009/10/19 18:41:12 bouyer Exp $ */
+/* $NetBSD: ahcisata_core.c,v 1.22 2009/11/21 23:47:01 jakllsch Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.21 2009/10/19 18:41:12 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.22 2009/11/21 23:47:01 jakllsch Exp $");
#include <sys/types.h>
#include <sys/malloc.h>
@@ -383,19 +383,19 @@
ahci_setup_port(sc, i);
chp->ch_ndrive = 1;
if (bus_space_subregion(sc->sc_ahcit, sc->sc_ahcih,
- AHCI_P_SSTS(i), 1, &achp->ahcic_sstatus) != 0) {
+ AHCI_P_SSTS(i), 4, &achp->ahcic_sstatus) != 0) {
aprint_error("%s: couldn't map channel %d "
"sata_status regs\n", AHCINAME(sc), i);
break;
}
if (bus_space_subregion(sc->sc_ahcit, sc->sc_ahcih,
- AHCI_P_SCTL(i), 1, &achp->ahcic_scontrol) != 0) {
+ AHCI_P_SCTL(i), 4, &achp->ahcic_scontrol) != 0) {
aprint_error("%s: couldn't map channel %d "
"sata_control regs\n", AHCINAME(sc), i);
break;
}
if (bus_space_subregion(sc->sc_ahcit, sc->sc_ahcih,
- AHCI_P_SERR(i), 1, &achp->ahcic_serror) != 0) {
+ AHCI_P_SERR(i), 4, &achp->ahcic_serror) != 0) {
aprint_error("%s: couldn't map channel %d "
"sata_error regs\n", AHCINAME(sc), i);
break;
