Module Name: src
Committed By: skrll
Date: Tue Dec 27 10:24:00 UTC 2016
Modified Files:
src/sys/dev/usb [nick-nhusb]: ehcivar.h
Log Message:
Missed commit in the ehci abort improvement
To generate a diff of this commit:
cvs rdiff -u -r1.42.14.26 -r1.42.14.27 src/sys/dev/usb/ehcivar.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/ehcivar.h
diff -u src/sys/dev/usb/ehcivar.h:1.42.14.26 src/sys/dev/usb/ehcivar.h:1.42.14.27
--- src/sys/dev/usb/ehcivar.h:1.42.14.26 Sat Apr 30 10:34:14 2016
+++ src/sys/dev/usb/ehcivar.h Tue Dec 27 10:24:00 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ehcivar.h,v 1.42.14.26 2016/04/30 10:34:14 skrll Exp $ */
+/* $NetBSD: ehcivar.h,v 1.42.14.27 2016/12/27 10:24:00 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -164,6 +164,7 @@ typedef struct ehci_softc {
device_t sc_dev;
kmutex_t sc_lock;
kmutex_t sc_intr_lock;
+ bool sc_dbanswered;
kcondvar_t sc_doorbell;
void *sc_doorbell_si;
void *sc_pcd_si;
@@ -210,8 +211,6 @@ typedef struct ehci_softc {
uint8_t sc_istthreshold; /* ISOC Scheduling Threshold (uframes) */
struct usbd_xfer *sc_intrxfer;
char sc_isreset[EHCI_MAX_PORTS];
- char sc_softwake;
- kcondvar_t sc_softwake_cv;
uint32_t sc_eintrs;
ehci_soft_qh_t *sc_async_head;
