修正接口配置不正确，以及数据写入写出不正确的问题

kbladewht · Mar 16, 2020 · b67c105 · b67c105
1 parent ab2a114
commit b67c105
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/usb/DAP_config.h b/usb/DAP_config.h
@@ -173,23 +173,23 @@ Configures the DAP Hardware I/O pins for Serial Wire Debug (SWD) mode:
 #define PORT_SWD_SETUP()                                     \
     SWD_DAT_IO = 1;                                          \
     SWD_CLK_IO = 1;                                          \
-    P1_MOD_OC &= ~((1 << SWD_DAT_BIT) | (1 << SWD_CLK_BIT)); \
-    P1_DIR_PU |= ((1 << SWD_DAT_BIT) | (1 << SWD_CLK_BIT))
+    P1_MOD_OC &= ~(SWD_DAT_BIT | SWD_CLK_BIT); \
+    P1_DIR_PU |= (SWD_DAT_BIT | SWD_CLK_BIT)
 
 /** Disable JTAG/SWD I/O Pins.
 Disables the DAP Hardware I/O pins which configures:
  - TCK/SWCLK, TMS/SWDIO, TDI, TDO, nTRST, nRESET to High-Z mode.
 */
 #define PORT_OFF()                                          \
-    P1_MOD_OC |= ((1 << SWD_DAT_BIT) | (1 << SWD_CLK_BIT)); \
-    P1_DIR_PU |= ((1 << SWD_DAT_BIT) | (1 << SWD_CLK_BIT))
+    P1_MOD_OC |= (SWD_DAT_BIT | SWD_CLK_BIT); \
+    P1_DIR_PU |= (SWD_DAT_BIT | SWD_CLK_BIT)
 
 // SWCLK/TCK I/O pin -------------------------------------
 
 /** SWCLK/TCK I/O pin: Get Input.
 \return Current status of the SWCLK/TCK DAP hardware I/O pin.
 */
-#define PIN_SWCLK_TCK_IN() SWD_CLK_IO
+#define PIN_SWCLK_TCK_IN() (SWD_CLK_IO & 0x01)
 
 /** SWCLK/TCK I/O pin: Set Output to High.
 Set the SWCLK/TCK DAP hardware I/O pin to high level.
@@ -206,7 +206,7 @@ Set the SWCLK/TCK DAP hardware I/O pin to low level.
 /** SWDIO/TMS I/O pin: Get Input.
 \return Current status of the SWDIO/TMS DAP hardware I/O pin.
 */
-#define PIN_SWDIO_TMS_IN() SWD_DAT_IO
+#define PIN_SWDIO_TMS_IN() (SWD_DAT_IO & 0x01)
 
 /** SWDIO/TMS I/O pin: Set Output to High.
 Set the SWDIO/TMS DAP hardware I/O pin to high level.
@@ -221,24 +221,25 @@ Set the SWDIO/TMS DAP hardware I/O pin to low level.
 /** SWDIO I/O pin: Get Input (used in SWD mode only).
 \return Current status of the SWDIO DAP hardware I/O pin.
 */
-#define PIN_SWDIO_IN(void) SWD_DAT_IO
+#define PIN_SWDIO_IN(void) (SWD_DAT_IO & 0x01)
 
 /** SWDIO I/O pin: Set Output (used in SWD mode only).
 \param bit Output value for the SWDIO DAP hardware I/O pin.
 */
-#define PIN_SWDIO_OUT(bit) SWD_DAT_IO = bit
+#define PIN_SWDIO_OUT(bit) SWD_DAT_IO = (bit & 0x01)
 
 /** SWDIO I/O pin: Switch to Output mode (used in SWD mode only).
 Configure the SWDIO DAP hardware I/O pin to output mode. This function is
 called prior \ref PIN_SWDIO_OUT function calls.
 */
-#define PIN_SWDIO_OUT_ENABLE() P1_MOD_OC &= ~(1 << SWD_DAT_BIT)
+#define PIN_SWDIO_OUT_ENABLE() P1_MOD_OC &= ~SWD_DAT_BIT
 
 /** SWDIO I/O pin: Switch to Input mode (used in SWD mode only).
 Configure the SWDIO DAP hardware I/O pin to input mode. This function is
 called prior \ref PIN_SWDIO_IN function calls.
 */
-#define PIN_SWDIO_OUT_DISABLE() P1_MOD_OC |= (1 << SWD_DAT_BIT)
+#define PIN_SWDIO_OUT_DISABLE() P1_MOD_OC |= SWD_DAT_BIT
+
 
 // TDI Pin I/O ---------------------------------------------
 

diff --git a/usb/SW_DP.c b/usb/SW_DP.c
@@ -178,8 +178,8 @@ uint8_t SWD_Transfer(uint8_t request, uint8_t* data)
                     SW_READ_BIT(bit); /* Read RDATA[0:31] */
                     parity += bit;
                     if (data) {
-                        data[b - 1] >>= 1;
-                        data[b - 1] |= bit << 7;
+                        data[b] >>= 1;
+                        data[b] |= bit << 7;
                     }
                 }
             }
@@ -200,8 +200,8 @@ uint8_t SWD_Transfer(uint8_t request, uint8_t* data)
             PIN_SWDIO_OUT_ENABLE();
             /* Write data */
             parity = 0U;
-            for (uint8_t b = 4; b; b--) {
-                val = *(data + b - 1);
+            for (uint8_t b = 0; b < 4; b++) {
+                val = *(data + b);
                 for (uint8_t n = 8U; n; n--) {
                     SW_WRITE_BIT(val); /* Write WDATA[0:31] */
                     parity += val;