Module Name: src
Committed By: kiyohara
Date: Tue Jun 21 15:13:34 UTC 2011
Modified Files:
src/sys/dev/ic: sl811hs.c sl811hsvar.h
Log Message:
More stride for PSIONTEKLOGIX NETBOOK PRO.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/ic/sl811hs.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ic/sl811hsvar.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/dev/ic/sl811hs.c
diff -u src/sys/dev/ic/sl811hs.c:1.28 src/sys/dev/ic/sl811hs.c:1.29
--- src/sys/dev/ic/sl811hs.c:1.28 Tue May 17 04:18:06 2011
+++ src/sys/dev/ic/sl811hs.c Tue Jun 21 15:13:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sl811hs.c,v 1.28 2011/05/17 04:18:06 mrg Exp $ */
+/* $NetBSD: sl811hs.c,v 1.29 2011/06/21 15:13:34 kiyohara Exp $ */
/*
* Not (c) 2007 Matthew Orgass
@@ -84,7 +84,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.28 2011/05/17 04:18:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.29 2011/06/21 15:13:34 kiyohara Exp $");
#include "opt_slhci.h"
@@ -1142,7 +1142,7 @@
* Note max_current argument is actual current, but stored as current/2 */
void
slhci_preinit(struct slhci_softc *sc, PowerFunc pow, bus_space_tag_t iot,
- bus_space_handle_t ioh, uint16_t max_current, uint8_t stride)
+ bus_space_handle_t ioh, uint16_t max_current, uint32_t stride)
{
struct slhci_transfers *t;
int i;
Index: src/sys/dev/ic/sl811hsvar.h
diff -u src/sys/dev/ic/sl811hsvar.h:1.7 src/sys/dev/ic/sl811hsvar.h:1.8
--- src/sys/dev/ic/sl811hsvar.h:1.7 Sat May 8 01:33:00 2010
+++ src/sys/dev/ic/sl811hsvar.h Tue Jun 21 15:13:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sl811hsvar.h,v 1.7 2010/05/08 01:33:00 isaki Exp $ */
+/* $NetBSD: sl811hsvar.h,v 1.8 2011/06/21 15:13:34 kiyohara Exp $ */
/*
* Not (c) 2007 Matthew Orgass
@@ -81,14 +81,14 @@
int sc_mem_use; /* XXX SLHCI_MEM_ACCOUNTING */
uint8_t sc_ier; /* enabled interrupts */
- uint8_t sc_stride; /* port stride */
+ uint32_t sc_stride; /* port stride */
};
/* last preinit arguments are: max current (in mA, not mA/2), port stride */
/* register access uses byte access, but stride offsets the data port */
int slhci_supported_rev(uint8_t);
void slhci_preinit(struct slhci_softc *, PowerFunc, bus_space_tag_t,
- bus_space_handle_t, uint16_t, uint8_t);
+ bus_space_handle_t, uint16_t, uint32_t);
int slhci_attach(struct slhci_softc *);
int slhci_detach(struct slhci_softc *, int);
int slhci_activate(device_t, enum devact);
