carl9170 firmware: implement endpoint halt req/clear and get endpoint status

[carl9170fw.git] / carlfw / include / usb.h

diff --git a/carlfw/include/usb.h b/carlfw/include/usb.h
index 3f35567f8b9910133cb45fb401a28c56ab39a859..fb258bf16bd37be843d3542f26fa771c921e76b4 100644 (file)
--- a/carlfw/include/usb.h
+++ b/carlfw/include/usb.h
@@ -6,7 +6,7 @@
  * Copyright (c) 2000-2005 ZyDAS Technology Corporation
  * Copyright (c) 2007-2009 Atheros Communications, Inc.
  * Copyright   2009    Johannes Berg <johannes@sipsolutions.net>
- * Copyright 2009, 2010 Christian Lamparter <chunkeey@googlemail.com>
+ * Copyright 2009-2011 Christian Lamparter <chunkeey@googlemail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -50,11 +50,16 @@ static inline __inline bool usb_configured(void)
                  AR9170_USB_DEVICE_ADDRESS_CONFIGURE);
 }
 
-static inline __inline void usb_remote_wakeup(void)
+static inline __inline void usb_enable_remote_wakeup(void)
 {
        orb(AR9170_USB_REG_MAIN_CTRL, AR9170_USB_MAIN_CTRL_REMOTE_WAKEUP);
 }
 
+static inline __inline void usb_disable_remote_wakeup(void)
+{
+       andb(AR9170_USB_REG_MAIN_CTRL, ~AR9170_USB_MAIN_CTRL_REMOTE_WAKEUP);
+}
+
 static inline __inline void usb_enable_global_int(void)
 {
        orb(AR9170_USB_REG_MAIN_CTRL, AR9170_USB_MAIN_CTRL_ENABLE_GLOBAL_INT);
@@ -136,6 +141,12 @@ static inline __inline void usb_clear_input_ep_toggle(unsigned int ep)
             ~AR9170_USB_EP_IN_TOGGLE);
 }
 
+static inline __inline void usb_clear_input_ep_stall(unsigned int ep)
+{
+       andl(AR9170_USB_REG_EP_IN_MAX_SIZE_HIGH + (ep << 1),
+            ~AR9170_USB_EP_IN_STALL);
+}
+
 static inline __inline void usb_set_input_ep_toggle(unsigned int ep)
 {
        orl(AR9170_USB_REG_EP_IN_MAX_SIZE_HIGH + (ep << 1),
@@ -154,6 +165,12 @@ static inline __inline void usb_set_output_ep_toggle(unsigned int ep)
            AR9170_USB_EP_OUT_TOGGLE);
 }
 
+static inline __inline void usb_clear_output_ep_stall(unsigned int ep)
+{
+       andl(AR9170_USB_REG_EP_OUT_MAX_SIZE_HIGH + (ep << 1),
+            ~AR9170_USB_EP_OUT_STALL);
+}
+
 static inline void usb_structure_check(void)
 {
        BUILD_BUG_ON(sizeof(struct usb_config_descriptor) != USB_DT_CONFIG_SIZE);