summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSean Cross <[email protected]>2019-11-12 21:11:46 -0800
committerSean Cross <[email protected]>2019-11-13 09:08:47 -0800
commit8c5f02960b7d41f663b0c6063a0cc268ef8d2270 (patch)
tree814e325ea84e9bb86a2d9b2cc58b920d18d3181b /src
parente05e9801e46e19bc541c1ca7d6a2cc37902f6b2a (diff)
valentyusb: rename from `foosn`
While Fomu is produced by Foosn, the actual name of the hardware block is `valentyusb`. Rename the module to match that. Signed-off-by: Sean Cross <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/portable/foosn/fomu/dcd_fomu.h151
-rw-r--r--src/portable/valentyusb/eptri/dcd_eptri.c (renamed from src/portable/foosn/fomu/dcd_fomu.c)4
-rw-r--r--src/portable/valentyusb/eptri/dcd_eptri.h39
-rw-r--r--src/portable/valentyusb/eptri/hal_eptri.c (renamed from src/portable/foosn/fomu/hal_fomu.c)2
4 files changed, 42 insertions, 154 deletions
diff --git a/src/portable/foosn/fomu/dcd_fomu.h b/src/portable/foosn/fomu/dcd_fomu.h
deleted file mode 100644
index 60bc1240f..000000000
--- a/src/portable/foosn/fomu/dcd_fomu.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2019 Ha Thach (tinyusb.org)
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * This file is part of the TinyUSB stack.
- */
-
-#ifndef _TUSB_DCD_FOMU_H_
-#define _TUSB_DCD_FOMU_H_
-
-#include "common/tusb_common.h"
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-// //--------------------------------------------------------------------+
-// // Register Interface
-// //--------------------------------------------------------------------+
-
-// //------------- USB Interrupt USBIntSt -------------//
-// //enum {
-// // DCD_USB_REQ_LOW_PRIO_MASK = TU_BIT(0),
-// // DCD_USB_REQ_HIGH_PRIO_MASK = TU_BIT(1),
-// // DCD_USB_REQ_DMA_MASK = TU_BIT(2),
-// // DCD_USB_REQ_NEED_CLOCK_MASK = TU_BIT(8),
-// // DCD_USB_REQ_ENABLE_MASK = TU_BIT(31)
-// //};
-
-// //------------- Device Interrupt USBDevInt -------------//
-// enum {
-// DEV_INT_FRAME_MASK = TU_BIT(0),
-// DEV_INT_ENDPOINT_FAST_MASK = TU_BIT(1),
-// DEV_INT_ENDPOINT_SLOW_MASK = TU_BIT(2),
-// DEV_INT_DEVICE_STATUS_MASK = TU_BIT(3),
-// DEV_INT_COMMAND_CODE_EMPTY_MASK = TU_BIT(4),
-// DEV_INT_COMMAND_DATA_FULL_MASK = TU_BIT(5),
-// DEV_INT_RX_ENDPOINT_PACKET_MASK = TU_BIT(6),
-// DEV_INT_TX_ENDPOINT_PACKET_MASK = TU_BIT(7),
-// DEV_INT_ENDPOINT_REALIZED_MASK = TU_BIT(8),
-// DEV_INT_ERROR_MASK = TU_BIT(9)
-// };
-
-// //------------- DMA Interrupt USBDMAInt-------------//
-// enum {
-// DMA_INT_END_OF_XFER_MASK = TU_BIT(0),
-// DMA_INT_NEW_DD_REQUEST_MASK = TU_BIT(1),
-// DMA_INT_ERROR_MASK = TU_BIT(2)
-// };
-
-// //------------- USBCtrl -------------//
-// enum {
-// USBCTRL_READ_ENABLE_MASK = TU_BIT(0),
-// USBCTRL_WRITE_ENABLE_MASK = TU_BIT(1),
-// };
-
-// //------------- USBRxPLen -------------//
-// enum {
-// USBRXPLEN_PACKET_LENGTH_MASK = (TU_BIT(10)-1),
-// USBRXPLEN_DATA_VALID_MASK = TU_BIT(10),
-// USBRXPLEN_PACKET_READY_MASK = TU_BIT(11),
-// };
-
-// //------------- SIE Command Code -------------//
-// typedef enum
-// {
-// SIE_CMDPHASE_WRITE = 1,
-// SIE_CMDPHASE_READ = 2,
-// SIE_CMDPHASE_COMMAND = 5
-// } sie_cmdphase_t;
-
-// enum {
-// // device commands
-// SIE_CMDCODE_SET_ADDRESS = 0xd0,
-// SIE_CMDCODE_CONFIGURE_DEVICE = 0xd8,
-// SIE_CMDCODE_SET_MODE = 0xf3,
-// SIE_CMDCODE_READ_FRAME_NUMBER = 0xf5,
-// SIE_CMDCODE_READ_TEST_REGISTER = 0xfd,
-// SIE_CMDCODE_DEVICE_STATUS = 0xfe,
-// SIE_CMDCODE_GET_ERROR = 0xff,
-// SIE_CMDCODE_READ_ERROR_STATUS = 0xfb,
-
-// // endpoint commands
-// SIE_CMDCODE_ENDPOINT_SELECT = 0x00, // + endpoint index
-// SIE_CMDCODE_ENDPOINT_SELECT_CLEAR_INTERRUPT = 0x40, // + endpoint index, should use USBEpIntClr instead
-// SIE_CMDCODE_ENDPOINT_SET_STATUS = 0x40, // + endpoint index
-// SIE_CMDCODE_BUFFER_CLEAR = 0xf2,
-// SIE_CMDCODE_BUFFER_VALIDATE = 0xfa
-// };
-
-// //------------- SIE Device Status (get/set from SIE_CMDCODE_DEVICE_STATUS) -------------//
-// enum {
-// SIE_DEV_STATUS_CONNECT_STATUS_MASK = TU_BIT(0),
-// SIE_DEV_STATUS_CONNECT_CHANGE_MASK = TU_BIT(1),
-// SIE_DEV_STATUS_SUSPEND_MASK = TU_BIT(2),
-// SIE_DEV_STATUS_SUSPEND_CHANGE_MASK = TU_BIT(3),
-// SIE_DEV_STATUS_RESET_MASK = TU_BIT(4)
-// };
-
-// //------------- SIE Select Endpoint Command -------------//
-// enum {
-// SIE_SELECT_ENDPOINT_FULL_EMPTY_MASK = TU_BIT(0), // 0: empty, 1 full. IN endpoint checks empty, OUT endpoint check full
-// SIE_SELECT_ENDPOINT_STALL_MASK = TU_BIT(1),
-// SIE_SELECT_ENDPOINT_SETUP_RECEIVED_MASK = TU_BIT(2), // clear by SIE_CMDCODE_ENDPOINT_SELECT_CLEAR_INTERRUPT
-// SIE_SELECT_ENDPOINT_PACKET_OVERWRITTEN_MASK = TU_BIT(3), // previous packet is overwritten by a SETUP packet
-// SIE_SELECT_ENDPOINT_NAK_MASK = TU_BIT(4), // last packet response is NAK (auto clear by an ACK)
-// SIE_SELECT_ENDPOINT_BUFFER1_FULL_MASK = TU_BIT(5),
-// SIE_SELECT_ENDPOINT_BUFFER2_FULL_MASK = TU_BIT(6)
-// };
-
-// typedef enum
-// {
-// SIE_SET_ENDPOINT_STALLED_MASK = TU_BIT(0),
-// SIE_SET_ENDPOINT_DISABLED_MASK = TU_BIT(5),
-// SIE_SET_ENDPOINT_RATE_FEEDBACK_MASK = TU_BIT(6),
-// SIE_SET_ENDPOINT_CONDITION_STALLED_MASK = TU_BIT(7),
-// }sie_endpoint_set_status_mask_t;
-
-// //------------- DMA Descriptor Status -------------//
-// enum {
-// DD_STATUS_NOT_SERVICED = 0,
-// DD_STATUS_BEING_SERVICED,
-// DD_STATUS_NORMAL,
-// DD_STATUS_DATA_UNDERUN, // short packet
-// DD_STATUS_DATA_OVERRUN,
-// DD_STATUS_SYSTEM_ERROR
-// };
-
-#ifdef __cplusplus
- }
-#endif
-
-#endif /* _TUSB_DCD_FOMU_H_ */
diff --git a/src/portable/foosn/fomu/dcd_fomu.c b/src/portable/valentyusb/eptri/dcd_eptri.c
index ee79366e4..d7e1b8a9a 100644
--- a/src/portable/foosn/fomu/dcd_fomu.c
+++ b/src/portable/valentyusb/eptri/dcd_eptri.c
@@ -34,10 +34,10 @@
#include "tusb_option.h"
-#if TUSB_OPT_DEVICE_ENABLED && (CFG_TUSB_MCU == OPT_MCU_FOMU_EPTRI)
+#if TUSB_OPT_DEVICE_ENABLED && (CFG_TUSB_MCU == OPT_MCU_VALENTYUSB_EPTRI)
#include "device/dcd.h"
-#include "dcd_fomu.h"
+#include "dcd_eptri.h"
#include "csr.h"
#include "irq.h"
void fomu_error(uint32_t line);
diff --git a/src/portable/valentyusb/eptri/dcd_eptri.h b/src/portable/valentyusb/eptri/dcd_eptri.h
new file mode 100644
index 000000000..0fa6ecc64
--- /dev/null
+++ b/src/portable/valentyusb/eptri/dcd_eptri.h
@@ -0,0 +1,39 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Ha Thach (tinyusb.org)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * This file is part of the TinyUSB stack.
+ */
+
+#ifndef _TUSB_DCD_VALENTYUSB_EPTRI_H_
+#define _TUSB_DCD_VALENTYUSB_EPTRI_H_
+
+#include "common/tusb_common.h"
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+#ifdef __cplusplus
+ }
+#endif
+
+#endif /* _TUSB_DCD_VALENTYUSB_EPTRI_H_ */
diff --git a/src/portable/foosn/fomu/hal_fomu.c b/src/portable/valentyusb/eptri/hal_eptri.c
index ebc0a1d93..72453affa 100644
--- a/src/portable/foosn/fomu/hal_fomu.c
+++ b/src/portable/valentyusb/eptri/hal_eptri.c
@@ -26,7 +26,7 @@
#include "common/tusb_common.h"
-#if (CFG_TUSB_MCU == OPT_MCU_FOMU_EPTRI)
+#if (CFG_TUSB_MCU == OPT_MCU_VALENTYUSB_EPTRI)
// No HAL-specific stuff here!