+#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
printf("device: 0x%04x, 0x%04x\n", desc.idVendor, desc.idProduct);
- if (desc.idVendor != 0x0483)
+ if (desc.idVendor != USB_ST_VID)
return 0;
- if (desc.idProduct != 0x3748)
+ if (desc.idProduct != USB_STLINK_32L_PID)
return 0;
return 1;
}
-void _stlink_usb_version(stlink_t * sl) {
+void _stlink_usb_version(stlink_t *sl) {
struct stlink_libusb * const slu = sl->backend_data;
unsigned char* const buf = sl->q_buf;
ssize_t size;
buf[0] = STLINK_GET_VERSION;
buf[1] = 0x80;
- size = send_recv(slu, buf, 16, buf, sizeof (sl->q_buf));
+ size = send_recv(slu, buf, STLINK_CMD_SIZE, buf, sizeof (sl->q_buf));
if (size == -1) {
printf("[!] send_recv\n");
return;
int _stlink_usb_current_mode(stlink_t * sl) {
- int mode = -1;
-
struct stlink_libusb * const slu = sl->backend_data;
unsigned char* const buf = sl->q_buf;
ssize_t size;
-
memset(buf, 0, sizeof (sl->q_buf));
-
buf[0] = STLINK_GET_CURRENT_MODE;
-
- size = send_recv(slu, buf, 16, buf, sizeof (sl->q_buf));
+ size = send_recv(slu, buf, STLINK_CMD_SIZE, buf, sizeof (sl->q_buf));
if (size == -1) {
printf("[!] send_recv\n");
return -1;
}
-
- /* mode = (int)read_uint16(buf, 0); */
- mode = (int) buf[0];
-
-#if 1 /* DEBUG */
- printf("mode == 0x%x\n", mode);
-#endif /* DEBUG */
-
-
- return mode;
+ return sl->q_buf[0];
}
void _stlink_usb_core_id(stlink_t * sl) {
buf[0] = STLINK_DEBUG_COMMAND;
buf[1] = STLINK_DEBUG_READCOREID;
- size = send_recv(slu, buf, 16, buf, sizeof (sl->q_buf));
+ size = send_recv(slu, buf, STLINK_CMD_SIZE, buf, sizeof (sl->q_buf));
if (size == -1) {
printf("[!] send_recv\n");
return;
buf[0] = STLINK_DEBUG_COMMAND;
buf[1] = STLINK_DEBUG_GETSTATUS;
- size = send_recv(slu, buf, 16, buf, sizeof (sl->q_buf));
+ size = send_recv(slu, buf, STLINK_CMD_SIZE, buf, sizeof (sl->q_buf));
if (size == -1) {
printf("[!] send_recv\n");
return;
}
-void _stlink_enter_swd_mode(stlink_t * sl) {
+void _stlink_usb_enter_swd_mode(stlink_t * sl) {
struct stlink_libusb * const slu = sl->backend_data;
unsigned char* const buf = sl->q_buf;
ssize_t size;
memset(buf, 0, sizeof (sl->q_buf));
buf[0] = STLINK_DEBUG_COMMAND;
- buf[1] = 0x30; /* needed byte */
- buf[2] = STLINK_DEBUG_ENTER_JTAG;
+ buf[1] = STLINK_SWD_ENTER;
+ buf[2] = STLINK_DEBUG_ENTER_SWD;
- size = send_recv(slu, buf, 16, buf, sizeof (sl->q_buf));
+ size = send_recv(slu, buf, STLINK_CMD_SIZE, buf, sizeof (sl->q_buf));
if (size == -1) {
printf("[!] send_recv\n");
return;
}
-
}
void _stlink_usb_exit_dfu_mode(stlink_t* sl) {
buf[0] = STLINK_DEBUG_COMMAND;
buf[1] = STLINK_DEBUG_RESETSYS;
- size = send_recv(slu, buf, 16, buf, sizeof (sl->q_buf));
+ size = send_recv(slu, buf, STLINK_CMD_SIZE, buf, sizeof (sl->q_buf));
if (size == -1) {
printf("[!] send_recv\n");
return;
buf[0] = STLINK_DEBUG_COMMAND;
buf[1] = STLINK_DEBUG_STEPCORE;
- size = send_recv(slu, buf, 16, buf, sizeof (sl->q_buf));
+ size = send_recv(slu, buf, STLINK_CMD_SIZE, buf, sizeof (sl->q_buf));
if (size == -1) {
printf("[!] send_recv\n");
return;
buf[0] = STLINK_DEBUG_COMMAND;
buf[1] = STLINK_DEBUG_RUNCORE;
- size = send_recv(slu, buf, 16, buf, sizeof (sl->q_buf));
+ size = send_recv(slu, buf, STLINK_CMD_SIZE, buf, sizeof (sl->q_buf));
if (size == -1) {
printf("[!] send_recv\n");
return;
ssize_t size;
/* assume len < sizeof(sl->q_buf) */
+ assert(len < sizeof(sl->q_buf)); // makes a compiler warning? always true?
memset(buf, 0, sizeof (sl->q_buf));
buf[0] = STLINK_DEBUG_COMMAND;
buf[1] = STLINK_DEBUG_READMEM_32BIT;
write_uint32(buf + 2, addr);
- write_uint16(buf + 6, len);
-#if 0
/* windows usb logs show only one byte is used for length ... */
+ // Presumably, this is because usb transfers can't be 16 bits worth of bytes long...
+ assert (len < 256);
buf[6] = (uint8_t) len;
-#endif
- size = send_recv(slu, buf, 0x10, buf, sizeof (sl->q_buf));
+ size = send_recv(slu, buf, STLINK_CMD_SIZE, buf, sizeof (sl->q_buf));
if (size == -1) {
printf("[!] send_recv\n");
return;
stlink_print_data(sl);
}
-void _stlink_usb_read_all_regs(stlink_t *sl) {
+void _stlink_usb_read_all_regs(stlink_t *sl, reg *regp) {
DD(sl, "oops! read_all_regs not implemented for USB!\n");
}
stlink_backend_t _stlink_usb_backend = {
_stlink_usb_close,
_stlink_usb_exit_debug_mode,
- _stlink_enter_swd_mode,
- NULL,
+ _stlink_usb_enter_swd_mode,
+ NULL, // no enter_jtag_mode here...
_stlink_usb_exit_dfu_mode,
_stlink_usb_core_id,
_stlink_usb_reset,
_stlink_usb_read_all_regs,
_stlink_usb_read_reg,
_stlink_usb_write_reg,
- _stlink_usb_step
+ _stlink_usb_step,
+ _stlink_usb_current_mode
};