Module Name: src
Committed By: jmcneill
Date: Sat Sep 13 18:36:39 UTC 2014
Modified Files:
src/sys/dev/usb: motg.c motgvar.h
Log Message:
let the bus driver override fifo size
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/usb/motg.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/motgvar.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/usb/motg.c
diff -u src/sys/dev/usb/motg.c:1.10 src/sys/dev/usb/motg.c:1.11
--- src/sys/dev/usb/motg.c:1.10 Sat Sep 13 17:42:48 2014
+++ src/sys/dev/usb/motg.c Sat Sep 13 18:36:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: motg.c,v 1.10 2014/09/13 17:42:48 jmcneill Exp $ */
+/* $NetBSD: motg.c,v 1.11 2014/09/13 18:36:39 jmcneill Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
#include "opt_motg.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.10 2014/09/13 17:42:48 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.11 2014/09/13 18:36:39 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -353,9 +353,13 @@ motg_init(struct motg_softc *sc)
/* select endpoint */
UWRITE1(sc, MUSB2_REG_EPINDEX, i);
- val = UREAD1(sc, MUSB2_REG_FSIZE);
- fiforx_size = (val & MUSB2_MASK_RX_FSIZE) >> 4;
- fifotx_size = (val & MUSB2_MASK_TX_FSIZE);
+ if (sc->sc_ep_fifosize) {
+ fiforx_size = fifotx_size = sc->sc_ep_fifosize;
+ } else {
+ val = UREAD1(sc, MUSB2_REG_FSIZE);
+ fiforx_size = (val & MUSB2_MASK_RX_FSIZE) >> 4;
+ fifotx_size = (val & MUSB2_MASK_TX_FSIZE);
+ }
DPRINTF(("Endpoint %u FIFO size: IN=%u, OUT=%u, DYN=%d\n",
i, fifotx_size, fiforx_size, dynfifo));
Index: src/sys/dev/usb/motgvar.h
diff -u src/sys/dev/usb/motgvar.h:1.3 src/sys/dev/usb/motgvar.h:1.4
--- src/sys/dev/usb/motgvar.h:1.3 Sat Sep 13 14:46:50 2014
+++ src/sys/dev/usb/motgvar.h Sat Sep 13 18:36:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: motgvar.h,v 1.3 2014/09/13 14:46:50 jmcneill Exp $ */
+/* $NetBSD: motgvar.h,v 1.4 2014/09/13 18:36:39 jmcneill Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -76,6 +76,7 @@ struct motg_softc {
void (*sc_intr_poll)(void *);
void *sc_intr_poll_arg;
int sc_ep_max;
+ u_int sc_ep_fifosize;
uint16_t sc_intr_tx_ep;
uint16_t sc_intr_rx_ep;
