Răsfoiți Sursa

move ehci and ohci to portable folder

hathach 5 ani în urmă
părinte
comite
451650fa32

+ 2 - 2
examples/host/cdc_msc_hid/Makefile

@@ -19,8 +19,8 @@ SRC_C += \
 	src/host/hub.c \
 	src/host/hub.c \
 	src/host/usbh.c \
 	src/host/usbh.c \
 	src/host/usbh_control.c \
 	src/host/usbh_control.c \
-	src/host/ehci/ehci.c \
-	src/host/ohci/ohci.c \
+	src/portable/ehci/ehci.c \
+	src/portable/ohci/ohci.c \
 	src/portable/nxp/transdimension/hcd_transdimension.c \
 	src/portable/nxp/transdimension/hcd_transdimension.c \
 	src/portable/nxp/lpc17_40/hcd_lpc17_40.c
 	src/portable/nxp/lpc17_40/hcd_lpc17_40.c
 
 

+ 0 - 7
examples/host/cdc_msc_hid/src/msc_app.c

@@ -73,13 +73,6 @@ void tuh_msc_mount_cb(uint8_t dev_addr)
 //      return;
 //      return;
 //    }
 //    }
 //
 //
-//    puts("---------------------------------------------------------------------");
-//    puts("- MASSSTORAGE CLASS CLI IS A IMMATURE CODE. DISK-WRITING COMMANDS");
-//    puts("- SUCH AS cp(COPY), mkdir(MAKE DIRECTORY) ARE POTENTIAL TO DAMAGE");
-//    puts("- YOUR USB THUMBDRIVE. USING THOSE COMMANDS ARE AT YOUR OWN RISK.");
-//    puts("- THE AUTHOR HAS NO RESPONSIBILITY WITH YOUR DEVICE NOR ITS DATA");
-//    puts("---------------------------------------------------------------------");
-//
 //    f_chdrive(phy_disk); // change to newly mounted drive
 //    f_chdrive(phy_disk); // change to newly mounted drive
 //    f_chdir("/"); // root as current dir
 //    f_chdir("/"); // root as current dir
 //
 //

+ 2 - 2
src/host/ehci/ehci.c → src/portable/ehci/ehci.c

@@ -35,8 +35,8 @@
 //--------------------------------------------------------------------+
 //--------------------------------------------------------------------+
 #include "osal/osal.h"
 #include "osal/osal.h"
 
 
-#include "../hcd.h"
-#include "../usbh_hcd.h"
+#include "host/hcd.h"
+#include "host/usbh_hcd.h"
 #include "ehci.h"
 #include "ehci.h"
 
 
 //--------------------------------------------------------------------+
 //--------------------------------------------------------------------+

+ 0 - 2
src/host/ehci/ehci.h → src/portable/ehci/ehci.h

@@ -33,8 +33,6 @@
 #ifndef _TUSB_EHCI_H_
 #ifndef _TUSB_EHCI_H_
 #define _TUSB_EHCI_H_
 #define _TUSB_EHCI_H_
 
 
-#include "common/tusb_common.h"
-#include "../hcd.h"
 
 
 /* Abbreviation
 /* Abbreviation
  * HC: Host Controller
  * HC: Host Controller

+ 5 - 3
src/host/ohci/ohci.c → src/portable/ohci/ohci.c

@@ -26,14 +26,16 @@
 
 
 #include <common/tusb_common.h>
 #include <common/tusb_common.h>
 
 
-#if TUSB_OPT_HOST_ENABLED && (CFG_TUSB_MCU == OPT_MCU_LPC175X_6X || CFG_TUSB_MCU == OPT_MCU_LPC40XX)
+#if TUSB_OPT_HOST_ENABLED && \
+    (CFG_TUSB_MCU == OPT_MCU_LPC175X_6X || CFG_TUSB_MCU == OPT_MCU_LPC40XX)
+
 //--------------------------------------------------------------------+
 //--------------------------------------------------------------------+
 // INCLUDE
 // INCLUDE
 //--------------------------------------------------------------------+
 //--------------------------------------------------------------------+
 #include "osal/osal.h"
 #include "osal/osal.h"
 
 
-#include "../hcd.h"
-#include "../usbh_hcd.h"
+#include "host/hcd.h"
+#include "host/usbh_hcd.h"
 #include "ohci.h"
 #include "ohci.h"
 
 
 // TODO remove
 // TODO remove

+ 0 - 2
src/host/ohci/ohci.h → src/portable/ohci/ohci.h

@@ -37,8 +37,6 @@
  extern "C" {
  extern "C" {
 #endif
 #endif
 
 
-#include "common/tusb_common.h"
-
 //--------------------------------------------------------------------+
 //--------------------------------------------------------------------+
 // OHCI CONFIGURATION & CONSTANTS
 // OHCI CONFIGURATION & CONSTANTS
 //--------------------------------------------------------------------+
 //--------------------------------------------------------------------+