Module Name: src
Committed By: skrll
Date: Tue Apr 26 10:28:28 UTC 2016
Modified Files:
src/sys/dev/ic: sl811hs.c
Log Message:
Fix SLHCI_XFER_TYPE
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/ic/sl811hs.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/sl811hs.c
diff -u src/sys/dev/ic/sl811hs.c:1.54 src/sys/dev/ic/sl811hs.c:1.55
--- src/sys/dev/ic/sl811hs.c:1.54 Tue Apr 26 10:10:27 2016
+++ src/sys/dev/ic/sl811hs.c Tue Apr 26 10:28:28 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sl811hs.c,v 1.54 2016/04/26 10:10:27 skrll Exp $ */
+/* $NetBSD: sl811hs.c,v 1.55 2016/04/26 10:28:28 skrll Exp $ */
/*
* Not (c) 2007 Matthew Orgass
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.54 2016/04/26 10:10:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.55 2016/04/26 10:28:28 skrll Exp $");
#include "opt_slhci.h"
@@ -168,8 +168,6 @@ pnames(int ptype)
}
#endif
-#define SLHCI_XFER_TYPE(x) (((struct slhci_pipe *)((x)->pipe))->ptype)
-
/*
* Maximum allowable reserved bus time. Since intr/isoc transfers have
* unconditional priority, this is all that ensures control and bulk transfers
@@ -296,6 +294,9 @@ struct slhci_pipe {
#define SLHCI_XFER2SC(xfer) SLHCI_BUS2SC((xfer)->ux_bus)
#define SLHCI_PIPE2SPIPE(pipe) ((struct slhci_pipe *)(pipe))
+#define SLHCI_XFER2SPIPE(xfer) SLHCI_PIPE2SPIPE((xfer)->ux_pipe)
+
+#define SLHCI_XFER_TYPE(x) (SLHCI_XFER2SPIPE(xfer)->ptype)
#ifdef SLHCI_PROFILE_TRANSFER
#if defined(__mips__)
