summaryrefslogtreecommitdiff
path: root/include/usb_mux.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/usb_mux.h')
-rw-r--r--include/usb_mux.h18
1 files changed, 12 insertions, 6 deletions
diff --git a/include/usb_mux.h b/include/usb_mux.h
index d5683cc847..d510a347d4 100644
--- a/include/usb_mux.h
+++ b/include/usb_mux.h
@@ -1,4 +1,4 @@
-/* Copyright 2012 The Chromium OS Authors. All rights reserved.
+/* Copyright 2012 The ChromiumOS Authors
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
@@ -128,9 +128,6 @@ struct usb_mux {
/* Mux driver */
const struct usb_mux_driver *driver;
- /* Linked list chain of secondary MUXes. NULL terminated */
- const struct usb_mux *next_mux;
-
/**
* Optional method for tuning for USB mux during mux->driver->init().
*
@@ -162,6 +159,15 @@ struct usb_mux {
bool *ack_required);
};
+/* Linked list chain of secondary MUXes. NULL terminated */
+struct usb_mux_chain {
+ /* Structure describing USB mux */
+ const struct usb_mux *mux;
+
+ /* Pointer to next mux */
+ const struct usb_mux_chain *next;
+};
+
/* Supported USB mux drivers */
extern const struct usb_mux_driver amd_fp5_usb_mux_driver;
extern const struct usb_mux_driver amd_fp6_usb_mux_driver;
@@ -177,9 +183,9 @@ extern const struct usb_mux_driver virtual_usb_mux_driver;
/* USB muxes present in system, ordered by PD port #, defined at board-level */
#ifdef CONFIG_USB_MUX_RUNTIME_CONFIG
-extern struct usb_mux usb_muxes[];
+extern struct usb_mux_chain usb_muxes[];
#else
-extern const struct usb_mux usb_muxes[];
+extern const struct usb_mux_chain usb_muxes[];
#endif
/* Supported hpd_update functions */