Even though the stlinkv1 and stlinkv2 use different usb classes they share
the same layout scheme.
Merge the two into a common layout, thus enabling us to support other
adapter layouts.
Change-Id: I7d02c44a7f94ebc7f2cb5428b02ee40294fb430d
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/918
Tested-by: jenkins
#include <jtag/stlink/stlink_transport.h>
#include <jtag/stlink/stlink_interface.h>
#include <jtag/stlink/stlink_transport.h>
#include <jtag/stlink/stlink_interface.h>
-#define STLINK_LAYOUT_UNKNOWN 0
-#define STLINK_LAYOUT_SG 1
-#define STLINK_LAYOUT_USB 2
-
static int stlink_layout_open(struct stlink_interface_s *stlink_if)
{
int res;
static int stlink_layout_open(struct stlink_interface_s *stlink_if)
{
int res;
static const struct stlink_layout stlink_layouts[] = {
{
static const struct stlink_layout stlink_layouts[] = {
{
- .name = "usb",
- .type = STLINK_LAYOUT_USB,
- .open = stlink_layout_open,
- .close = stlink_layout_close,
- .api = &stlink_usb_layout_api,
- },
- {
- .name = "sg",
- .type = STLINK_LAYOUT_SG,
.open = stlink_layout_open,
.close = stlink_layout_close,
.api = &stlink_usb_layout_api,
.open = stlink_layout_open,
.close = stlink_layout_close,
.api = &stlink_usb_layout_api,
/** */
char *name;
/** */
/** */
char *name;
/** */
int (*open) (struct stlink_interface_s *stlink_if);
/** */
int (*close) (struct stlink_interface_s *stlink_if);
int (*open) (struct stlink_interface_s *stlink_if);
/** */
int (*close) (struct stlink_interface_s *stlink_if);
stlink_device_desc "ST-LINK/V1"
stlink_vid_pid 0x0483 0x3744
stlink_device_desc "ST-LINK/V1"
stlink_vid_pid 0x0483 0x3744
stlink_device_desc "ST-LINK/V2"
stlink_vid_pid 0x0483 0x3748
stlink_device_desc "ST-LINK/V2"
stlink_vid_pid 0x0483 0x3748
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)