Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
jtag: fix minor typos
[openocd.git] / src / jtag / drivers / usbprog.c
diff --git a/src/jtag/drivers/usbprog.c b/src/jtag/drivers/usbprog.c
index e90d56931e3876ea1f1e82219eca4c914dc11ef6..67cad58f4c8e85be882dddbe7b4a41ef354ce74c 100644 (file)
--- a/src/jtag/drivers/usbprog.c
+++ b/src/jtag/drivers/usbprog.c
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 /*
@@ -96,11 +94,6 @@ static void usbprog_jtag_write_slice(struct usbprog_jtag *usbprog_jtag, unsigned
 static void usbprog_jtag_set_bit(struct usbprog_jtag *usbprog_jtag, int bit, int value);
 /* static int usbprog_jtag_get_bit(struct usbprog_jtag *usbprog_jtag, int bit); */
 
-static int usbprog_speed(int speed)
-{
-       return ERROR_OK;
-}
-
 static int usbprog_execute_queue(void)
 {
        struct jtag_command *cmd = jtag_command_queue;  /* currently processed command */
@@ -110,62 +103,50 @@ static int usbprog_execute_queue(void)
 
        while (cmd) {
                switch (cmd->type) {
-                   case JTAG_RESET:
-#ifdef _DEBUG_JTAG_IO_
-                           LOG_DEBUG("reset trst: %i srst %i",
-                               cmd->cmd.reset->trst,
-                               cmd->cmd.reset->srst);
-#endif
-                           if (cmd->cmd.reset->trst == 1)
-                                   tap_set_state(TAP_RESET);
-                           usbprog_reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst);
-                           break;
-                   case JTAG_RUNTEST:
-#ifdef _DEBUG_JTAG_IO_
-                           LOG_DEBUG("runtest %i cycles, end in %i",
-                               cmd->cmd.runtest->num_cycles,
-                               cmd->cmd.runtest->end_state);
-#endif
-                           usbprog_end_state(cmd->cmd.runtest->end_state);
-                           usbprog_runtest(cmd->cmd.runtest->num_cycles);
-                           break;
-                   case JTAG_TLR_RESET:
-#ifdef _DEBUG_JTAG_IO_
-                           LOG_DEBUG("statemove end in %i", cmd->cmd.statemove->end_state);
-#endif
-                           usbprog_end_state(cmd->cmd.statemove->end_state);
-                           usbprog_state_move();
-                           break;
-                   case JTAG_PATHMOVE:
-#ifdef _DEBUG_JTAG_IO_
-                           LOG_DEBUG("pathmove: %i states, end in %i",
-                               cmd->cmd.pathmove->num_states,
-                               cmd->cmd.pathmove->path[cmd->cmd.pathmove->num_states - 1]);
-#endif
-                           usbprog_path_move(cmd->cmd.pathmove);
-                           break;
-                   case JTAG_SCAN:
-#ifdef _DEBUG_JTAG_IO_
-                           LOG_DEBUG("scan end in %i", cmd->cmd.scan->end_state);
-#endif
-                           usbprog_end_state(cmd->cmd.scan->end_state);
-                           scan_size = jtag_build_buffer(cmd->cmd.scan, &buffer);
-                           type = jtag_scan_type(cmd->cmd.scan);
-                           usbprog_scan(cmd->cmd.scan->ir_scan, type, buffer, scan_size);
-                           if (jtag_read_buffer(buffer, cmd->cmd.scan) != ERROR_OK)
-                                   return ERROR_JTAG_QUEUE_FAILED;
-                           if (buffer)
-                                   free(buffer);
-                           break;
-                   case JTAG_SLEEP:
-#ifdef _DEBUG_JTAG_IO_
-                           LOG_DEBUG("sleep %i", cmd->cmd.sleep->us);
-#endif
-                           jtag_sleep(cmd->cmd.sleep->us);
-                           break;
-                   default:
-                           LOG_ERROR("BUG: unknown JTAG command type encountered");
-                           exit(-1);
+               case JTAG_RESET:
+                       LOG_DEBUG_IO("reset trst: %i srst %i",
+                                       cmd->cmd.reset->trst,
+                                       cmd->cmd.reset->srst);
+                       if (cmd->cmd.reset->trst == 1)
+                               tap_set_state(TAP_RESET);
+                       usbprog_reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst);
+                       break;
+               case JTAG_RUNTEST:
+                       LOG_DEBUG_IO("runtest %i cycles, end in %i",
+                                       cmd->cmd.runtest->num_cycles,
+                                       cmd->cmd.runtest->end_state);
+                       usbprog_end_state(cmd->cmd.runtest->end_state);
+                       usbprog_runtest(cmd->cmd.runtest->num_cycles);
+                       break;
+               case JTAG_TLR_RESET:
+                       LOG_DEBUG_IO("statemove end in %i", cmd->cmd.statemove->end_state);
+                       usbprog_end_state(cmd->cmd.statemove->end_state);
+                       usbprog_state_move();
+                       break;
+               case JTAG_PATHMOVE:
+                       LOG_DEBUG_IO("pathmove: %i states, end in %i",
+                                       cmd->cmd.pathmove->num_states,
+                                       cmd->cmd.pathmove->path[cmd->cmd.pathmove->num_states - 1]);
+                       usbprog_path_move(cmd->cmd.pathmove);
+                       break;
+               case JTAG_SCAN:
+                       LOG_DEBUG_IO("scan end in %i", cmd->cmd.scan->end_state);
+                       usbprog_end_state(cmd->cmd.scan->end_state);
+                       scan_size = jtag_build_buffer(cmd->cmd.scan, &buffer);
+                       type = jtag_scan_type(cmd->cmd.scan);
+                       usbprog_scan(cmd->cmd.scan->ir_scan, type, buffer, scan_size);
+                       if (jtag_read_buffer(buffer, cmd->cmd.scan) != ERROR_OK)
+                               return ERROR_JTAG_QUEUE_FAILED;
+                       if (buffer)
+                               free(buffer);
+                       break;
+               case JTAG_SLEEP:
+                       LOG_DEBUG_IO("sleep %i", cmd->cmd.sleep->us);
+                       jtag_sleep(cmd->cmd.sleep->us);
+                       break;
+               default:
+                       LOG_ERROR("BUG: unknown JTAG command type encountered");
+                       exit(-1);
                }
 
                cmd = cmd->next;
@@ -277,10 +258,8 @@ static void usbprog_runtest(int num_cycles)
                usbprog_write(0, 0, 0);
        }
 
-#ifdef _DEBUG_JTAG_IO_
-       LOG_DEBUG("runtest: cur_state %s end_state %s", tap_state_name(
+       LOG_DEBUG_IO("runtest: cur_state %s end_state %s", tap_state_name(
                        tap_get_state()), tap_state_name(tap_get_end_state()));
-#endif
 
        /* finish in end_state */
        /*
@@ -402,7 +381,7 @@ static void usbprog_jtag_close(struct usbprog_jtag *usbprog_jtag)
 static unsigned char usbprog_jtag_message(struct usbprog_jtag *usbprog_jtag, char *msg, int msglen)
 {
        int res = usb_bulk_write(usbprog_jtag->usb_handle, 3, msg, msglen, 100);
-       if ((msg[0] == 2) || (msg[0] == 1) || (msg[0] == 4) || (msg[0] == 0) || \
+       if ((msg[0] == 2) || (msg[0] == 1) || (msg[0] == 4) || (msg[0] == 0) ||
            (msg[0] == 6) || (msg[0] == 0x0A) || (msg[0] == 9))
                return 1;
        if (res == msglen) {
@@ -424,11 +403,11 @@ static void usbprog_jtag_init(struct usbprog_jtag *usbprog_jtag)
 
 static void usbprog_jtag_write_and_read(struct usbprog_jtag *usbprog_jtag, char *buffer, int size)
 {
-       char tmp[64];   /* fastes packet size for usb controller */
+       char tmp[64];   /* fastest packet size for usb controller */
        int send_bits, bufindex = 0, fillindex = 0, i, loops;
 
        char swap;
-       /* 61 byte can be transfered (488 bit) */
+       /* 61 byte can be transferred (488 bit) */
 
        while (size > 0) {
                if (size > 488) {
@@ -470,11 +449,11 @@ static void usbprog_jtag_write_and_read(struct usbprog_jtag *usbprog_jtag, char
 
 static void usbprog_jtag_read_tdo(struct usbprog_jtag *usbprog_jtag, char *buffer, int size)
 {
-       char tmp[64];   /* fastes packet size for usb controller */
+       char tmp[64];   /* fastest packet size for usb controller */
        int send_bits, fillindex = 0, i, loops;
 
        char swap;
-       /* 61 byte can be transfered (488 bit) */
+       /* 61 byte can be transferred (488 bit) */
 
        while (size > 0) {
                if (size > 488) {
@@ -511,10 +490,10 @@ static void usbprog_jtag_read_tdo(struct usbprog_jtag *usbprog_jtag, char *buffe
 
 static void usbprog_jtag_write_tdi(struct usbprog_jtag *usbprog_jtag, char *buffer, int size)
 {
-       char tmp[64];   /* fastes packet size for usb controller */
+       char tmp[64];   /* fastest packet size for usb controller */
        int send_bits, bufindex = 0, i, loops;
 
-       /* 61 byte can be transfered (488 bit) */
+       /* 61 byte can be transferred (488 bit) */
        while (size > 0) {
                if (size > 488) {
                        send_bits = 488;
@@ -617,11 +596,16 @@ static void usbprog_jtag_tms_send(struct usbprog_jtag *usbprog_jtag)
        }
 }
 
-struct jtag_interface usbprog_interface = {
+static struct jtag_interface usbprog_interface = {
+       .execute_queue = usbprog_execute_queue,
+};
+
+struct adapter_driver usbprog_adapter_driver = {
        .name = "usbprog",
+       .transports = jtag_only,
 
-       .execute_queue = usbprog_execute_queue,
-       .speed = usbprog_speed,
        .init = usbprog_init,
-       .quit = usbprog_quit
+       .quit = usbprog_quit,
+
+       .jtag_ops = &usbprog_interface,
 };
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)