Module Name: src
Committed By: skrll
Date: Fri Sep 4 07:38:05 UTC 2015
Modified Files:
src/sys/arch/arm/zynq: zynq_usb.c zynq_usbreg.h
Log Message:
Correct a register name
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/zynq/zynq_usb.c \
src/sys/arch/arm/zynq/zynq_usbreg.h
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/arm/zynq/zynq_usb.c
diff -u src/sys/arch/arm/zynq/zynq_usb.c:1.1 src/sys/arch/arm/zynq/zynq_usb.c:1.2
--- src/sys/arch/arm/zynq/zynq_usb.c:1.1 Fri Jan 23 12:34:09 2015
+++ src/sys/arch/arm/zynq/zynq_usb.c Fri Sep 4 07:38:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: zynq_usb.c,v 1.1 2015/01/23 12:34:09 hkenken Exp $ */
+/* $NetBSD: zynq_usb.c,v 1.2 2015/09/04 07:38:05 skrll Exp $ */
/*-
* Copyright (c) 2015 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zynq_usb.c,v 1.1 2015/01/23 12:34:09 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zynq_usb.c,v 1.2 2015/09/04 07:38:05 skrll Exp $");
#include "opt_zynq.h"
@@ -372,7 +372,7 @@ zynqusb_host_mode(struct zynqehci_softc
reg |= OTGSC_DPIE | OTGSC_IDIE;
bus_space_write_4(sc->sc_iot, sc->sc_ioh, ZYNQUSB_OTGSC, reg);
- reg = bus_space_read_4(sc->sc_iot, sc->sc_ioh, ZYNQUSB_OTGMODE);
+ reg = bus_space_read_4(sc->sc_iot, sc->sc_ioh, ZYNQUSB_USBMODE);
reg |= USBMODE_CM_HOST;
- bus_space_write_4(sc->sc_iot, sc->sc_ioh, ZYNQUSB_OTGMODE, reg);
+ bus_space_write_4(sc->sc_iot, sc->sc_ioh, ZYNQUSB_USBMODE, reg);
}
Index: src/sys/arch/arm/zynq/zynq_usbreg.h
diff -u src/sys/arch/arm/zynq/zynq_usbreg.h:1.1 src/sys/arch/arm/zynq/zynq_usbreg.h:1.2
--- src/sys/arch/arm/zynq/zynq_usbreg.h:1.1 Fri Jan 23 12:34:09 2015
+++ src/sys/arch/arm/zynq/zynq_usbreg.h Fri Sep 4 07:38:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: zynq_usbreg.h,v 1.1 2015/01/23 12:34:09 hkenken Exp $ */
+/* $NetBSD: zynq_usbreg.h,v 1.2 2015/09/04 07:38:05 skrll Exp $ */
/*-
* Copyright (c) 2015 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation.
@@ -87,7 +87,7 @@
#define OTGSC_HAAR __BIT( 2)
#define OTGSC_VC __BIT( 1)
#define OTGSC_VD __BIT( 0)
-#define ZYNQUSB_OTGMODE 0x01A8
+#define ZYNQUSB_USBMODE 0x01A8
#define USBMODE_CM __BITS(1,0)
#define USBMODE_CM_IDLE __SHIFTIN(0, USBMODE_CM)
#define USBMODE_CM_DEVICE __SHIFTIN(2, USBMODE_CM)
