Fix for failed merge conflict resolve

pull/1129/head
nightwalker-87 2021-04-25 20:39:12 +02:00
rodzic d70f4ee28c
commit 1e8333e8ac
1 zmienionych plików z 2 dodań i 2 usunięć

Wyświetl plik

@ -763,8 +763,8 @@ static struct stlink_chipid_params devices[] = {
},
};
const struct stlink_chipid_params *stlink_chipid_get_params(uint32_t chipid) {
const struct stlink_chipid_params *params = NULL;
struct stlink_chipid_params *stlink_chipid_get_params_old(uint32_t chipid) {
struct stlink_chipid_params *params = NULL;
for (size_t n = 0; n < STLINK_ARRAY_SIZE(devices); n++)
if (devices[n].chip_id == chipid) {