Changeset 224 for rtos_arduino/trunk/arduino_lib/hardware/arduino/samd/cores/arduino/USB/USBAPI.h

Timestamp:

Apr 30, 2016, 11:29:25 PM (8 years ago)

Author:

ertl-honda

Message:

1.7.10のファイルに更新

File:

• rtos_arduino/trunk/arduino_lib/hardware/arduino/samd/cores/arduino/USB/USBAPI.h (modified) (8 diffs)

rtos_arduino/trunk/arduino_lib/hardware/arduino/samd/cores/arduino/USB/USBAPI.h

@@ -1 +1 @@
 /*
-  Copyright (c) 2012 Arduino.  All right reserved.
+  Copyright (c) 2015 Arduino LLC.  All right reserved.
 
   This library is free software; you can redistribute it and/or
@@ -16 +16 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
-
-#ifndef __USBAPI__
-#define __USBAPI__
-
-
-/* Define attribute */
-#if defined   ( __CC_ARM   ) /* Keil uVision 4 */
-    #define WEAK (__attribute__ ((weak)))
-#elif defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */
-    #define WEAK __weak
-#elif defined (  __GNUC__  ) /* GCC CS */
-    #define WEAK __attribute__ ((weak))
-#endif
-
+/*
+**Modified 04/04/2016 by Arduino.org development team
+*/
+
+#pragma once
+
+#define WEAK __attribute__ ((weak))
+
+#define HSTPIPCFG_PTYPE_BLK 1
+#define HSTPIPCFG_PTOKEN_IN 2
+#define HSTPIPCFG_PTOKEN_OUT 3
+#define HSTPIPCFG_PBK_1_BANK 4
+#define HSTPIPCFG_PTYPE_INTRPT 5
+
+#define EP0      0
+#define EPX_SIZE 64 // 64 for Full Speed, EPT size max is 1024
 
 #if defined __cplusplus
@@ -37 +39 @@
 
 //================================================================================
-//================================================================================
-//      USB
-
-class USBDevice_
-{
-public:
-        USBDevice_();
+// USB
+//================================================================================
+//================================================================================
+// Low level API
+typedef struct {
+        union {
+                uint8_t bmRequestType;
+                struct {
+                        uint8_t direction : 5;
+                        uint8_t type : 2;
+                        uint8_t transferDirection : 1;
+                };
+        };
+        uint8_t bRequest;
+        uint8_t wValueL;
+        uint8_t wValueH;
+        uint16_t wIndex;
+        uint16_t wLength;
+} Setup;
+
+
+class USBDevice_ {
+public:
+        USBDevice_() {};
+
+        // USB Device API
+        void init();
+        bool attach();  // Serial port goes down too...
+        bool detach();
+
         bool configured();
 
-        bool attach();
-        bool detach();  // Serial port goes down too...
-        void poll();
-        void init();
-};
+private:
+        bool initialized;
+};
+
 extern USBDevice_ USBDevice;
 
 //================================================================================
-//================================================================================
 //      Serial over CDC (Serial1 is the physical port)
 
 class Serial_ : public Stream
 {
-private:
-        RingBuffer *_cdc_rx_buffer;
-public:
+public:
+        Serial_(USBDevice_ &_usb) : usb(_usb) { }
         void begin(uint32_t baud_count);
         void begin(unsigned long, uint8_t);
@@ -75 +97 @@
         using Print::write; // pull in write(str) from Print
         operator bool();
+
+        // This method allows processing "SEND_BREAK" requests sent by
+        // the USB host. Those requests indicate that the host wants to
+        // send a BREAK signal and are accompanied by a single uint16_t
+        // value, specifying the duration of the break. The value 0
+        // means to end any current break, while the value 0xffff means
+        // to start an indefinite break.
+        // readBreak() will return the value of the most recent break
+        // request, but will return it at most once, returning -1 when
+        // readBreak() is called again (until another break request is
+        // received, which is again returned once).
+        // This also mean that if two break requests are received
+        // without readBreak() being called in between, the value of the
+        // first request is lost.
+        // Note that the value returned is a long, so it can return
+        // 0-0xffff as well as -1.
+        int32_t readBreak();
+
+        // These return the settings specified by the USB host for the
+        // serial port. These aren't really used, but are offered here
+        // in case a sketch wants to act on these settings.
+        uint32_t baud();
+        uint8_t stopbits();
+        uint8_t paritytype();
+        uint8_t numbits();
+        bool dtr();
+        bool rts();
+        enum {
+                ONE_STOP_BIT = 0,
+                ONE_AND_HALF_STOP_BIT = 1,
+                TWO_STOP_BITS = 2,
+        };
+        enum {
+                NO_PARITY = 0,
+                ODD_PARITY = 1,
+                EVEN_PARITY = 2,
+                MARK_PARITY = 3,
+                SPACE_PARITY = 4,
+        };
+
+private:
+        USBDevice_ &usb;
+        RingBuffer *_cdc_rx_buffer;
 };
 extern Serial_ SerialUSB;
@@ -171 +236 @@
 //================================================================================
 //================================================================================
-//      Low level API
-
-typedef struct
-{
-        uint8_t bmRequestType;
-        uint8_t bRequest;
-        uint8_t wValueL;
-        uint8_t wValueH;
-        uint16_t wIndex;
-        uint16_t wLength;
-        uint8_t data[8];
-} Setup;
-
-//================================================================================
-//================================================================================
 //      HID 'Driver'
 
@@ -202 +252 @@
 uint32_t                MSC_GetInterface(uint8_t* interfaceNum);
 uint32_t                MSC_GetDescriptor(uint32_t i);
-bool    MSC_Setup(Setup& setup);
+bool    MSC_Setup(Setup& pSetup);
 bool    MSC_Data(uint8_t rx,uint8_t tx);
 
@@ -209 +259 @@
 //      CDC 'Driver'
 
-const void* CDC_GetInterface(/*uint8_t* interfaceNum*/);
-uint32_t WEAK CDC_GetInterfaceLength(void);
+int CDC_GetInterface(uint8_t* interfaceNum);
+const void* _CDC_GetInterface(void);
+uint32_t _CDC_GetInterfaceLength(void);
 uint32_t                CDC_GetOtherInterface(uint8_t* interfaceNum);
 uint32_t                CDC_GetDescriptor(uint32_t i);
-bool    CDC_Setup(Setup& setup);
-
-//================================================================================
-//================================================================================
-
-uint32_t USBD_SendControl(uint8_t flags, const void* d, uint32_t len);
+bool    CDC_Setup(Setup& pSetup);
+
+
+//================================================================================
+//================================================================================
+
+uint32_t USBD_SendControl(const void* _data, uint32_t len);
 uint32_t USBD_RecvControl(void* d, uint32_t len);
+void USBD_Calibrate();
 uint32_t USBD_SendInterfaces(void);
 bool USBD_ClassInterfaceRequest(Setup& setup);
@@ -228 +281 @@
 uint32_t USBD_Recv(uint32_t ep, void* data, uint32_t len);              // non-blocking
 uint32_t USBD_Recv(uint32_t ep);                                                        // non-blocking
+uint8_t USBD_armRecv(uint32_t ep);
 void USBD_Flush(uint32_t ep);
 uint32_t USBD_Connected(void);
 
 #endif  // __cplusplus
-#endif  // __USBAPI__