May 2021 - flashrom-gerrit - mail.coreboot.org

Change in flashrom[master]: buspirate_spi.c: Refactor singleton states into reentrant pattern
by Anastasia Klimchuk (Code Review) 05 May '21

05 May '21

Anastasia Klimchuk has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/52958 ) Change subject: buspirate_spi.c: Refactor singleton states into reentrant pattern ...................................................................... buspirate_spi.c: Refactor singleton states into reentrant pattern Move global singleton states into a struct and store within the spi_master data field for the life-time of the driver. This is one of the steps on the way to move spi_master data memory management behind the initialisation API, for more context see other patches under the same topic "register_master_api". BUG=b:185191942 TEST=builds Change-Id: I418bbfff15fb126b042fbc9be09dbf59f4d243b8 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M buspirate_spi.c 1 file changed, 121 insertions(+), 101 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/58/52958/1 diff --git a/buspirate_spi.c b/buspirate_spi.c index 31d36cd..a8b9163 100644 --- a/buspirate_spi.c +++ b/buspirate_spi.c @@ -50,26 +50,28 @@ #define sp_flush_incoming(...) 0 #endif -static unsigned char *bp_commbuf = NULL; -static int bp_commbufsize = 0; +struct buspirate_spi_data { + unsigned char *bp_commbuf; + int bp_commbufsize; +}; -static int buspirate_commbuf_grow(int bufsize) +static int buspirate_commbuf_grow(int bufsize, struct buspirate_spi_data *buspirate_data) { unsigned char *tmpbuf; /* Never shrink. realloc() calls are expensive. */ - if (bufsize <= bp_commbufsize) + if (bufsize <= buspirate_data->bp_commbufsize) return 0; - tmpbuf = realloc(bp_commbuf, bufsize); + tmpbuf = realloc(buspirate_data->bp_commbuf, bufsize); if (!tmpbuf) { /* Keep the existing buffer because memory is already tight. */ msg_perr("Out of memory!\n"); return ERROR_OOM; } - bp_commbuf = tmpbuf; - bp_commbufsize = bufsize; + buspirate_data->bp_commbuf = tmpbuf; + buspirate_data->bp_commbufsize = bufsize; return 0; } @@ -162,26 +164,27 @@ static int buspirate_spi_shutdown(void *data) { + struct buspirate_spi_data *buspirate_data = data; int ret = 0, ret2 = 0; /* No need to allocate a buffer here, we know that bp_commbuf is at least DEFAULT_BUFSIZE big. */ /* Exit raw SPI mode (enter raw bitbang mode) */ - bp_commbuf[0] = 0x00; - if ((ret = buspirate_sendrecv(bp_commbuf, 1, 0))) + buspirate_data->bp_commbuf[0] = 0x00; + if ((ret = buspirate_sendrecv(buspirate_data->bp_commbuf, 1, 0))) goto out_shutdown; - if ((ret = buspirate_wait_for_string(bp_commbuf, "BBIO"))) + if ((ret = buspirate_wait_for_string(buspirate_data->bp_commbuf, "BBIO"))) goto out_shutdown; - if ((ret = buspirate_sendrecv(bp_commbuf, 0, 1))) + if ((ret = buspirate_sendrecv(buspirate_data->bp_commbuf, 0, 1))) goto out_shutdown; - msg_pdbg("Raw bitbang mode version %c\n", bp_commbuf[0]); - if (bp_commbuf[0] != '1') { - msg_perr("Can't handle raw bitbang mode version %c!\n", bp_commbuf[0]); + msg_pdbg("Raw bitbang mode version %c\n", buspirate_data->bp_commbuf[0]); + if (buspirate_data->bp_commbuf[0] != '1') { + msg_perr("Can't handle raw bitbang mode version %c!\n", buspirate_data->bp_commbuf[0]); ret = 1; goto out_shutdown; } /* Reset Bus Pirate (return to user terminal) */ - bp_commbuf[0] = 0x0f; - ret = buspirate_sendrecv(bp_commbuf, 1, 0); + buspirate_data->bp_commbuf[0] = 0x0f; + ret = buspirate_sendrecv(buspirate_data->bp_commbuf, 1, 0); out_shutdown: /* Shut down serial port communication */ @@ -189,14 +192,14 @@ /* Keep the oldest error, it is probably the best indicator. */ if (ret2 && !ret) ret = ret2; - bp_commbufsize = 0; - free(bp_commbuf); - bp_commbuf = NULL; + + free(buspirate_data->bp_commbuf); if (ret) msg_pdbg("Bus Pirate shutdown failed.\n"); else msg_pdbg("Bus Pirate shutdown completed.\n"); + free(data); return ret; } @@ -205,50 +208,51 @@ { unsigned int i = 0; int ret = 0; + struct buspirate_spi_data *buspirate_data = flash->mst->spi.data; if (writecnt > 16 || readcnt > 16 || (readcnt + writecnt) > 16) return SPI_INVALID_LENGTH; /* 3 bytes extra for CS#, len, CS#. */ - if (buspirate_commbuf_grow(writecnt + readcnt + 3)) + if (buspirate_commbuf_grow(writecnt + readcnt + 3, buspirate_data)) return ERROR_OOM; /* Assert CS# */ - bp_commbuf[i++] = 0x02; + buspirate_data->bp_commbuf[i++] = 0x02; - bp_commbuf[i++] = 0x10 | (writecnt + readcnt - 1); - memcpy(bp_commbuf + i, writearr, writecnt); + buspirate_data->bp_commbuf[i++] = 0x10 | (writecnt + readcnt - 1); + memcpy(buspirate_data->bp_commbuf + i, writearr, writecnt); i += writecnt; - memset(bp_commbuf + i, 0, readcnt); + memset(buspirate_data->bp_commbuf + i, 0, readcnt); i += readcnt; /* De-assert CS# */ - bp_commbuf[i++] = 0x03; + buspirate_data->bp_commbuf[i++] = 0x03; - ret = buspirate_sendrecv(bp_commbuf, i, i); + ret = buspirate_sendrecv(buspirate_data->bp_commbuf, i, i); if (ret) { msg_perr("Bus Pirate communication error!\n"); return SPI_GENERIC_ERROR; } - if (bp_commbuf[0] != 0x01) { + if (buspirate_data->bp_commbuf[0] != 0x01) { msg_perr("Protocol error while lowering CS#!\n"); return SPI_GENERIC_ERROR; } - if (bp_commbuf[1] != 0x01) { + if (buspirate_data->bp_commbuf[1] != 0x01) { msg_perr("Protocol error while reading/writing SPI!\n"); return SPI_GENERIC_ERROR; } - if (bp_commbuf[i - 1] != 0x01) { + if (buspirate_data->bp_commbuf[i - 1] != 0x01) { msg_perr("Protocol error while raising CS#!\n"); return SPI_GENERIC_ERROR; } /* Skip CS#, length, writearr. */ - memcpy(readarr, bp_commbuf + 2 + writecnt, readcnt); + memcpy(readarr, buspirate_data->bp_commbuf + 2 + writecnt, readcnt); return ret; } @@ -257,6 +261,7 @@ const unsigned char *writearr, unsigned char *readarr) { int i = 0, ret = 0; + struct buspirate_spi_data *buspirate_data = flash->mst->spi.data; if (writecnt > 4096 || readcnt > 4096 || (readcnt + writecnt) > 4096) return SPI_INVALID_LENGTH; @@ -264,31 +269,31 @@ /* 5 bytes extra for command, writelen, readlen. * 1 byte extra for Ack/Nack. */ - if (buspirate_commbuf_grow(max(writecnt + 5, readcnt + 1))) + if (buspirate_commbuf_grow(max(writecnt + 5, readcnt + 1), buspirate_data)) return ERROR_OOM; /* Combined SPI write/read. */ - bp_commbuf[i++] = 0x04; - bp_commbuf[i++] = (writecnt >> 8) & 0xff; - bp_commbuf[i++] = writecnt & 0xff; - bp_commbuf[i++] = (readcnt >> 8) & 0xff; - bp_commbuf[i++] = readcnt & 0xff; - memcpy(bp_commbuf + i, writearr, writecnt); + buspirate_data->bp_commbuf[i++] = 0x04; + buspirate_data->bp_commbuf[i++] = (writecnt >> 8) & 0xff; + buspirate_data->bp_commbuf[i++] = writecnt & 0xff; + buspirate_data->bp_commbuf[i++] = (readcnt >> 8) & 0xff; + buspirate_data->bp_commbuf[i++] = readcnt & 0xff; + memcpy(buspirate_data->bp_commbuf + i, writearr, writecnt); - ret = buspirate_sendrecv(bp_commbuf, i + writecnt, 1 + readcnt); + ret = buspirate_sendrecv(buspirate_data->bp_commbuf, i + writecnt, 1 + readcnt); if (ret) { msg_perr("Bus Pirate communication error!\n"); return SPI_GENERIC_ERROR; } - if (bp_commbuf[0] != 0x01) { + if (buspirate_data->bp_commbuf[0] != 0x01) { msg_perr("Protocol error while sending SPI write/read!\n"); return SPI_GENERIC_ERROR; } /* Skip Ack. */ - memcpy(readarr, bp_commbuf + 1, readcnt); + memcpy(readarr, buspirate_data->bp_commbuf + 1, readcnt); return ret; } @@ -316,6 +321,9 @@ int serialspeed_index = -1; int ret = 0; int pullup = 0; + unsigned char *bp_commbuf = NULL; + int bp_commbufsize = 0; + struct buspirate_spi_data *buspirate_data; dev = extract_programmer_param("dev"); if (dev && !strlen(dev)) { @@ -385,6 +393,18 @@ return ret; } + buspirate_data = calloc(1, sizeof(*buspirate_data)); + if (!buspirate_data) { + msg_perr("Unable to allocate space for SPI master data\n"); + bp_commbufsize = 0; + free(bp_commbuf); + bp_commbuf = NULL; + return 1; + } + buspirate_data->bp_commbuf = bp_commbuf; + buspirate_data->bp_commbufsize = bp_commbufsize; + spi_master_buspirate.data = buspirate_data; + /* This is the brute force version, but it should work. * It is likely to fail if a previous flashrom run was aborted during a write with the new SPI commands * in firmware v5.5 because that firmware may wait for up to 4096 bytes of input before responding to @@ -392,9 +412,9 @@ */ for (i = 0; i < 20; i++) { /* Enter raw bitbang mode */ - bp_commbuf[0] = 0x00; + buspirate_data->bp_commbuf[0] = 0x00; /* Send the command, don't read the response. */ - ret = buspirate_sendrecv(bp_commbuf, 1, 0); + ret = buspirate_sendrecv(buspirate_data->bp_commbuf, 1, 0); if (ret) goto init_err_cleanup_exit; /* The old way to handle responses from a Bus Pirate already in BBIO mode was to flush any @@ -408,65 +428,65 @@ internal_sleep(10000); } /* We know that 20 commands of \0 should elicit at least one BBIO1 response. */ - if ((ret = buspirate_wait_for_string(bp_commbuf, "BBIO"))) + if ((ret = buspirate_wait_for_string(buspirate_data->bp_commbuf, "BBIO"))) goto init_err_cleanup_exit; /* Reset the Bus Pirate. */ - bp_commbuf[0] = 0x0f; + buspirate_data->bp_commbuf[0] = 0x0f; /* Send the command, don't read the response. */ - if ((ret = buspirate_sendrecv(bp_commbuf, 1, 0))) + if ((ret = buspirate_sendrecv(buspirate_data->bp_commbuf, 1, 0))) goto init_err_cleanup_exit; - if ((ret = buspirate_wait_for_string(bp_commbuf, "irate "))) + if ((ret = buspirate_wait_for_string(buspirate_data->bp_commbuf, "irate "))) goto init_err_cleanup_exit; /* Read the hardware version string. Last byte of the buffer is reserved for \0. */ for (i = 0; i < DEFAULT_BUFSIZE - 1; i++) { - if ((ret = buspirate_sendrecv(bp_commbuf + i, 0, 1))) + if ((ret = buspirate_sendrecv(buspirate_data->bp_commbuf + i, 0, 1))) goto init_err_cleanup_exit; - if (strchr("\r\n\t ", bp_commbuf[i])) + if (strchr("\r\n\t ", buspirate_data->bp_commbuf[i])) break; } - bp_commbuf[i] = '\0'; + buspirate_data->bp_commbuf[i] = '\0'; msg_pdbg("Detected Bus Pirate hardware "); - if (bp_commbuf[0] != 'v') + if (buspirate_data->bp_commbuf[0] != 'v') msg_pdbg("(unknown version number format)"); - else if (!strchr("0123456789", bp_commbuf[1])) + else if (!strchr("0123456789", buspirate_data->bp_commbuf[1])) msg_pdbg("(unknown version number format)"); else { - hw_version_major = strtoul((char *)bp_commbuf + 1, &tmp, 10); + hw_version_major = strtoul((char *)buspirate_data->bp_commbuf + 1, &tmp, 10); while ((*tmp != '\0') && !strchr("0123456789", *tmp)) tmp++; hw_version_minor = strtoul(tmp, NULL, 10); msg_pdbg("%u.%u", hw_version_major, hw_version_minor); } - msg_pdbg2(" (\"%s\")", bp_commbuf); + msg_pdbg2(" (\"%s\")", buspirate_data->bp_commbuf); msg_pdbg("\n"); - if ((ret = buspirate_wait_for_string(bp_commbuf, "irmware "))) + if ((ret = buspirate_wait_for_string(buspirate_data->bp_commbuf, "irmware "))) goto init_err_cleanup_exit; /* Read the firmware version string. Last byte of the buffer is reserved for \0. */ for (i = 0; i < DEFAULT_BUFSIZE - 1; i++) { - if ((ret = buspirate_sendrecv(bp_commbuf + i, 0, 1))) + if ((ret = buspirate_sendrecv(buspirate_data->bp_commbuf + i, 0, 1))) goto init_err_cleanup_exit; - if (strchr("\r\n\t ", bp_commbuf[i])) + if (strchr("\r\n\t ", buspirate_data->bp_commbuf[i])) break; } - bp_commbuf[i] = '\0'; + buspirate_data->bp_commbuf[i] = '\0'; msg_pdbg("Detected Bus Pirate firmware "); - if (bp_commbuf[0] != 'v') + if (buspirate_data->bp_commbuf[0] != 'v') msg_pdbg("(unknown version number format)"); - else if (!strchr("0123456789", bp_commbuf[1])) + else if (!strchr("0123456789", buspirate_data->bp_commbuf[1])) msg_pdbg("(unknown version number format)"); else { - fw_version_major = strtoul((char *)bp_commbuf + 1, &tmp, 10); + fw_version_major = strtoul((char *)buspirate_data->bp_commbuf + 1, &tmp, 10); while ((*tmp != '\0') && !strchr("0123456789", *tmp)) tmp++; fw_version_minor = strtoul(tmp, NULL, 10); msg_pdbg("%u.%u", fw_version_major, fw_version_minor); } - msg_pdbg2(" (\"%s\")", bp_commbuf); + msg_pdbg2(" (\"%s\")", buspirate_data->bp_commbuf); msg_pdbg("\n"); - if ((ret = buspirate_wait_for_string(bp_commbuf, "HiZ>"))) + if ((ret = buspirate_wait_for_string(buspirate_data->bp_commbuf, "HiZ>"))) goto init_err_cleanup_exit; /* Tell the user about missing SPI binary mode in firmware 2.3 and older. */ @@ -481,7 +501,7 @@ if (BP_FWVERSION(fw_version_major, fw_version_minor) >= BP_FWVERSION(5, 5)) { msg_pdbg("Using SPI command set v2.\n"); /* Sensible default buffer size. */ - if (buspirate_commbuf_grow(260 + 5)) { + if (buspirate_commbuf_grow(260 + 5, buspirate_data)) { ret = ERROR_OOM; goto init_err_cleanup_exit; } @@ -493,7 +513,7 @@ msg_pinfo("Reading/writing a flash chip may take hours.\n"); msg_pinfo("It is recommended to upgrade to firmware 5.5 or newer.\n"); /* Sensible default buffer size. */ - if (buspirate_commbuf_grow(16 + 3)) { + if (buspirate_commbuf_grow(16 + 3, buspirate_data)) { ret = ERROR_OOM; goto init_err_cleanup_exit; } @@ -534,24 +554,24 @@ " Continue at your own risk.\n"); /* Enter baud rate configuration mode */ - cnt = snprintf((char *)bp_commbuf, DEFAULT_BUFSIZE, "b\n"); - if ((ret = buspirate_sendrecv(bp_commbuf, cnt, 0))) + cnt = snprintf((char *)buspirate_data->bp_commbuf, DEFAULT_BUFSIZE, "b\n"); + if ((ret = buspirate_sendrecv(buspirate_data->bp_commbuf, cnt, 0))) goto init_err_cleanup_exit; - if ((ret = buspirate_wait_for_string(bp_commbuf, ">"))) + if ((ret = buspirate_wait_for_string(buspirate_data->bp_commbuf, ">"))) goto init_err_cleanup_exit; /* Enter manual clock divisor entry mode */ - cnt = snprintf((char *)bp_commbuf, DEFAULT_BUFSIZE, "10\n"); - if ((ret = buspirate_sendrecv(bp_commbuf, cnt, 0))) + cnt = snprintf((char *)buspirate_data->bp_commbuf, DEFAULT_BUFSIZE, "10\n"); + if ((ret = buspirate_sendrecv(buspirate_data->bp_commbuf, cnt, 0))) goto init_err_cleanup_exit; - if ((ret = buspirate_wait_for_string(bp_commbuf, ">"))) + if ((ret = buspirate_wait_for_string(buspirate_data->bp_commbuf, ">"))) goto init_err_cleanup_exit; /* Set the clock divisor to the value calculated from the user's input */ - cnt = snprintf((char *)bp_commbuf, DEFAULT_BUFSIZE, "%d\n", + cnt = snprintf((char *)buspirate_data->bp_commbuf, DEFAULT_BUFSIZE, "%d\n", BP_DIVISOR(serialspeeds[serialspeed_index].speed)); - if ((ret = buspirate_sendrecv(bp_commbuf, cnt, 0))) + if ((ret = buspirate_sendrecv(buspirate_data->bp_commbuf, cnt, 0))) goto init_err_cleanup_exit; sleep(1); @@ -563,9 +583,9 @@ /* Return to the main prompt */ bp_commbuf[0] = ' '; - if ((ret = buspirate_sendrecv(bp_commbuf, 1, 0))) + if ((ret = buspirate_sendrecv(buspirate_data->bp_commbuf, 1, 0))) goto init_err_cleanup_exit; - if ((ret = buspirate_wait_for_string(bp_commbuf, "HiZ>"))) + if ((ret = buspirate_wait_for_string(buspirate_data->bp_commbuf, "HiZ>"))) goto init_err_cleanup_exit; msg_pdbg("Serial speed is %d baud\n", serialspeeds[serialspeed_index].speed); @@ -577,50 +597,50 @@ /* Enter raw bitbang mode */ for (i = 0; i < 20; i++) { - bp_commbuf[0] = 0x00; - if ((ret = buspirate_sendrecv(bp_commbuf, 1, 0))) + buspirate_data->bp_commbuf[0] = 0x00; + if ((ret = buspirate_sendrecv(buspirate_data->bp_commbuf, 1, 0))) goto init_err_cleanup_exit; } - if ((ret = buspirate_wait_for_string(bp_commbuf, "BBIO"))) + if ((ret = buspirate_wait_for_string(buspirate_data->bp_commbuf, "BBIO"))) goto init_err_cleanup_exit; - if ((ret = buspirate_sendrecv(bp_commbuf, 0, 1))) + if ((ret = buspirate_sendrecv(buspirate_data->bp_commbuf, 0, 1))) goto init_err_cleanup_exit; msg_pdbg("Raw bitbang mode version %c\n", bp_commbuf[0]); - if (bp_commbuf[0] != '1') { - msg_perr("Can't handle raw bitbang mode version %c!\n", bp_commbuf[0]); + if (buspirate_data->bp_commbuf[0] != '1') { + msg_perr("Can't handle raw bitbang mode version %c!\n", buspirate_data->bp_commbuf[0]); ret = 1; goto init_err_cleanup_exit; } /* Enter raw SPI mode */ - bp_commbuf[0] = 0x01; - ret = buspirate_sendrecv(bp_commbuf, 1, 0); + buspirate_data->bp_commbuf[0] = 0x01; + ret = buspirate_sendrecv(buspirate_data->bp_commbuf, 1, 0); if (ret) { ret = 1; goto init_err_cleanup_exit; } - if ((ret = buspirate_wait_for_string(bp_commbuf, "SPI"))) + if ((ret = buspirate_wait_for_string(buspirate_data->bp_commbuf, "SPI"))) goto init_err_cleanup_exit; - if ((ret = buspirate_sendrecv(bp_commbuf, 0, 1))) + if ((ret = buspirate_sendrecv(buspirate_data->bp_commbuf, 0, 1))) goto init_err_cleanup_exit; - msg_pdbg("Raw SPI mode version %c\n", bp_commbuf[0]); - if (bp_commbuf[0] != '1') { + msg_pdbg("Raw SPI mode version %c\n", buspirate_data->bp_commbuf[0]); + if (buspirate_data->bp_commbuf[0] != '1') { msg_perr("Can't handle raw SPI mode version %c!\n", bp_commbuf[0]); ret = 1; goto init_err_cleanup_exit; } /* Initial setup (SPI peripherals config): Enable power, CS high, AUX */ - bp_commbuf[0] = 0x40 | 0x0b; + buspirate_data->bp_commbuf[0] = 0x40 | 0x0b; if (pullup == 1) { - bp_commbuf[0] |= (1 << 2); + buspirate_data->bp_commbuf[0] |= (1 << 2); msg_pdbg("Enabling pull-up resistors.\n"); } - ret = buspirate_sendrecv(bp_commbuf, 1, 1); + ret = buspirate_sendrecv(buspirate_data->bp_commbuf, 1, 1); if (ret) { ret = 1; goto init_err_cleanup_exit; } - if (bp_commbuf[0] != 0x01) { + if (buspirate_data->bp_commbuf[0] != 0x01) { msg_perr("Protocol error while setting power/CS/AUX(/Pull-up resistors)!\n"); ret = 1; goto init_err_cleanup_exit; @@ -628,48 +648,48 @@ /* Set SPI speed */ bp_commbuf[0] = 0x60 | spispeed; - ret = buspirate_sendrecv(bp_commbuf, 1, 1); + ret = buspirate_sendrecv(buspirate_data->bp_commbuf, 1, 1); if (ret) { ret = 1; goto init_err_cleanup_exit; } - if (bp_commbuf[0] != 0x01) { + if (buspirate_data->bp_commbuf[0] != 0x01) { msg_perr("Protocol error while setting SPI speed!\n"); ret = 1; goto init_err_cleanup_exit; } /* Set SPI config: output type, idle, clock edge, sample */ - bp_commbuf[0] = 0x80 | 0xa; + buspirate_data->bp_commbuf[0] = 0x80 | 0xa; if (pullup == 1) { - bp_commbuf[0] &= ~(1 << 3); + buspirate_data->bp_commbuf[0] &= ~(1 << 3); msg_pdbg("Pull-ups enabled, so using HiZ pin output! (Open-Drain mode)\n"); } - ret = buspirate_sendrecv(bp_commbuf, 1, 1); + ret = buspirate_sendrecv(buspirate_data->bp_commbuf, 1, 1); if (ret) { ret = 1; goto init_err_cleanup_exit; } - if (bp_commbuf[0] != 0x01) { + if (buspirate_data->bp_commbuf[0] != 0x01) { msg_perr("Protocol error while setting SPI config!\n"); ret = 1; goto init_err_cleanup_exit; } /* De-assert CS# */ - bp_commbuf[0] = 0x03; - ret = buspirate_sendrecv(bp_commbuf, 1, 1); + buspirate_data->bp_commbuf[0] = 0x03; + ret = buspirate_sendrecv(buspirate_data->bp_commbuf, 1, 1); if (ret) { ret = 1; goto init_err_cleanup_exit; } - if (bp_commbuf[0] != 0x01) { + if (buspirate_data->bp_commbuf[0] != 0x01) { msg_perr("Protocol error while raising CS#!\n"); ret = 1; goto init_err_cleanup_exit; } - if (register_shutdown(buspirate_spi_shutdown, NULL) != 0) { + if (register_shutdown(buspirate_spi_shutdown, buspirate_data) != 0) { ret = 1; goto init_err_cleanup_exit; } @@ -678,6 +698,6 @@ return 0; init_err_cleanup_exit: - buspirate_spi_shutdown(NULL); + buspirate_spi_shutdown(buspirate_data); return ret; } -- To view, visit https://review.coreboot.org/c/flashrom/+/52958 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I418bbfff15fb126b042fbc9be09dbf59f4d243b8 Gerrit-Change-Number: 52958 Gerrit-PatchSet: 1 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: libflashrom: Return progress state to the library user
by Daniel Campello (Code Review) 05 May '21

05 May '21

Attention is currently required from: Richard Hughes, Edward O'Callaghan, Angel Pons, Anastasia Klimchuk, Patrick Rudolph. Daniel Campello has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/49643 ) Change subject: libflashrom: Return progress state to the library user ...................................................................... Patch Set 7: (4 comments) Commit Message: https://review.coreboot.org/c/flashrom/+/49643/comment/8d558e4a_6c8952a7 PS4, Line 9: Include test for the dummy spi25 device. > If you could elaborate more on what this commit is doing, it would be great. […] Done Commit Message: https://review.coreboot.org/c/flashrom/+/49643/comment/7ae0e13b_95194deb PS6, Line 9: Projects using libflashrom like fwupd expect the user to wait for the operation : to complete. To avoid the user thinking the process has "hung" or "got stuck" : report back the progress complete of the erase, write and read operations > That's good, thank you! One thing left, limit for commit message lines is 72 chars, look like this o […] Done File libflashrom.c: https://review.coreboot.org/c/flashrom/+/49643/comment/142391fb_52ee526d PS4, Line 113: private > private from the libflashrom API, as in "internal" to the flashrom implementation. […] Resolving File lspcon_i2c_spi.c: https://review.coreboot.org/c/flashrom/+/49643/comment/7afa6a45_7abc905b PS5, Line 355: PAGE_SIZE > LSPCON_PAGE_SIZE ? commit cbe8a39ece4c228ffb23736da3f477ef3b82358c Done -- To view, visit https://review.coreboot.org/c/flashrom/+/49643 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7197572bb7f19e3bdb2bde855d70a0f50fd3854c Gerrit-Change-Number: 49643 Gerrit-PatchSet: 7 Gerrit-Owner: Richard Hughes <richard(a)hughsie.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-CC: Richard Hughes <hughsient(a)gmail.com> Gerrit-CC: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Richard Hughes <richard(a)hughsie.com> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Comment-Date: Wed, 05 May 2021 14:50:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Edward O'Callaghan <quasisec(a)chromium.org> Comment-In-Reply-To: Daniel Campello <campello(a)chromium.org> Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: CHROMIUM: flashrom_tester: Remove --ignore-fmap option
by Daniel Campello (Code Review) 05 May '21

05 May '21

Attention is currently required from: Angel Pons, Peter Marheine. Daniel Campello has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/52890 ) Change subject: CHROMIUM: flashrom_tester: Remove --ignore-fmap option ...................................................................... Patch Set 2: (3 comments) Commit Message: https://review.coreboot.org/c/flashrom/+/52890/comment/701134a2_9a123a50 PS1, Line 7: cli_classic.c > This file is not changed Done https://review.coreboot.org/c/flashrom/+/52890/comment/4118f9f8_dd41a6f4 PS1, Line 11: implicetely > typo: implicitly Done Patchset: PS1: > Yeah, I don't know if there's any relevant convention or guideline. […] Done -- To view, visit https://review.coreboot.org/c/flashrom/+/52890 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ib329f3adb59ce1848d1540844d64b968f49eb22a Gerrit-Change-Number: 52890 Gerrit-PatchSet: 2 Gerrit-Owner: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Angel Pons <th3fanbus(a)gmail.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Comment-Date: Wed, 05 May 2021 14:47:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com> Comment-In-Reply-To: Daniel Campello <campello(a)chromium.org> Comment-In-Reply-To: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: CHROMIUM: flashrom_tester: Remove --ignore-fmap option
by Daniel Campello (Code Review) 05 May '21

05 May '21

Attention is currently required from: Daniel Campello. Hello build bot (Jenkins), Edward O'Callaghan, Peter Marheine, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/52890 to look at the new patch set (#2). Change subject: CHROMIUM: flashrom_tester: Remove --ignore-fmap option ...................................................................... CHROMIUM: flashrom_tester: Remove --ignore-fmap option This change removes --ignore-fmap as this is implicitly computed based on other supplied options by the user. Original-Signed-off-by: Daniel Campello <campello(a)chromium.org> Original-Cq-Depend: chromium:2854174, chrome-internal:3789445, chromium:2854014 Original-Change-Id: I841a56d8726644cedd7d616ddfd5656b92dd7e59 Original-Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/flashrom/… Original-Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> (cherry picked from commit 2e2a5e449229e9c9604235a98b56e5dd29bf25cf) Change-Id: Ib329f3adb59ce1848d1540844d64b968f49eb22a --- M util/flashrom_tester/flashrom/src/cmd.rs M util/flashrom_tester/flashrom/src/lib.rs 2 files changed, 3 insertions(+), 10 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/90/52890/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/52890 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ib329f3adb59ce1848d1540844d64b968f49eb22a Gerrit-Change-Number: 52890 Gerrit-PatchSet: 2 Gerrit-Owner: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Angel Pons <th3fanbus(a)gmail.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Daniel Campello <campello(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: [WIP] replace programmer enum with a pointer to programmer_entry
by Thomas Heijligen (Code Review) 05 May '21

05 May '21

Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/51925 ) Change subject: [WIP] replace programmer enum with a pointer to programmer_entry ...................................................................... Patch Set 5: (1 comment) This change is ready for review. Patchset: PS5: Makefile: internal.c:173:5: error: no previous prototype for 'internal_init' [-Werror=missing-prototypes] 173 | int internal_init(void) | ^~~~~~~~~~~~~ Meson runs without errors Maybe the init function need to be static now -- To view, visit https://review.coreboot.org/c/flashrom/+/51925 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7435ee2bb661e4f139034bb289b84ebd41e1e9e9 Gerrit-Change-Number: 51925 Gerrit-PatchSet: 5 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Xiang Wang <wxjstz(a)126.com> Gerrit-Comment-Date: Wed, 05 May 2021 14:24:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: [WIP] move programmer_entry to each programmer file
by Thomas Heijligen (Code Review) 05 May '21

05 May '21

Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/52946 ) Change subject: [WIP] move programmer_entry to each programmer file ...................................................................... [WIP] move programmer_entry to each programmer file Change-Id: I3d02bd789f0299e936eb86819b3b15b5ea2bb921 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> --- M atahpt.c M atapromise.c M atavia.c M buspirate_spi.c M ch341a_spi.c M dediprog.c M developerbox_spi.c M digilent_spi.c M drkaiser.c M dummyflasher.c M ene_lpc.c M ft2232_spi.c M gfxnvidia.c M internal.c M it8212.c M jlink_spi.c M linux_mtd.c M linux_spi.c M lspcon_i2c_spi.c M mec1308.c M mstarddc_spi.c M ni845x_spi.c M nic3com.c M nicintel.c M nicintel_eeprom.c M nicintel_spi.c M nicnatsemi.c M nicrealtek.c M ogp_spi.c M pickit2_spi.c M pony_spi.c M programmer.h M programmer_table.c M raiden_debug_spi.c M rayer_spi.c M realtek_mst_i2c_spi.c M satamv.c M satasii.c M serprog.c M stlinkv3_spi.c M usbblaster_spi.c 41 files changed, 447 insertions(+), 547 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/46/52946/1 diff --git a/atahpt.c b/atahpt.c index dae0222..12218cb 100644 --- a/atahpt.c +++ b/atahpt.c @@ -94,6 +94,16 @@ return INB(io_base_addr + BIOS_ROM_DATA); } +const struct programmer_entry programmer_atahpt = { + .name = "atahpt", + .type = PCI, + .devs.dev = ata_hpt, + .init = atahpt_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; + #else #error PCI port I/O access is not supported on this architecture yet. #endif diff --git a/atapromise.c b/atapromise.c index ab34a1e..f10c3f9 100644 --- a/atapromise.c +++ b/atapromise.c @@ -165,6 +165,16 @@ return pci_mmio_readb(atapromise_bar + (addr & ADDR_MASK)); } +const struct programmer_entry programmer_atapromise = { + .name = "atapromise", + .type = PCI, + .devs.dev = ata_promise, + .init = atapromise_init, + .map_flash_region = atapromise_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; + #else #error PCI port I/O access is not supported on this architecture yet. #endif diff --git a/atavia.c b/atavia.c index b407a30..5268fc3 100644 --- a/atavia.c +++ b/atavia.c @@ -190,3 +190,13 @@ msg_pspew("%s: 0x%02x from 0x%*" PRIxPTR ".\n", __func__, val, PRIxPTR_WIDTH, addr); return val; } + +const struct programmer_entry programmer_atavia = { + .name = "atavia", + .type = PCI, + .devs.dev = ata_via, + .init = atavia_init, + .map_flash_region = atavia_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; \ No newline at end of file diff --git a/buspirate_spi.c b/buspirate_spi.c index eee8daa..e46e752 100644 --- a/buspirate_spi.c +++ b/buspirate_spi.c @@ -659,3 +659,14 @@ return 0; } + +const struct programmer_entry programmer_buspirate_spi = { + .name = "buspirate_spi", + .type = OTHER, + /* FIXME */ + .devs.note = "Dangerous Prototypes Bus Pirate\n", + .init = buspirate_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; \ No newline at end of file diff --git a/ch341a_spi.c b/ch341a_spi.c index 84cc3fe..f0b6843 100644 --- a/ch341a_spi.c +++ b/ch341a_spi.c @@ -526,3 +526,13 @@ handle = NULL; return -1; } + +const struct programmer_entry programmer_ch341a_spi = { + .name = "ch341a_spi", + .type = USB, + .devs.dev = devs_ch341a_spi, + .init = ch341a_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = ch341a_spi_delay, +}; \ No newline at end of file diff --git a/dediprog.c b/dediprog.c index c50e374..addecc9 100644 --- a/dediprog.c +++ b/dediprog.c @@ -1278,3 +1278,13 @@ return 0; } + +const struct programmer_entry programmer_dediprog = { + .name = "dediprog", + .type = USB, + .devs.dev = devs_dediprog, + .init = dediprog_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; \ No newline at end of file diff --git a/developerbox_spi.c b/developerbox_spi.c index 4ff2fb6..fd91c89 100644 --- a/developerbox_spi.c +++ b/developerbox_spi.c @@ -167,3 +167,13 @@ libusb_exit(usb_ctx); return 1; } + +const struct programmer_entry programmer_developerbox = { + .name = "developerbox", + .type = USB, + .devs.dev = devs_developerbox_spi, + .init = developerbox_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; \ No newline at end of file diff --git a/digilent_spi.c b/digilent_spi.c index 0f7a9da..a44a8bd 100644 --- a/digilent_spi.c +++ b/digilent_spi.c @@ -454,3 +454,13 @@ handle = NULL; return -1; } + +const struct programmer_entry programmer_digilent_spi = { + .name = "digilent_spi", + .type = USB, + .devs.dev = devs_digilent_spi, + .init = digilent_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; \ No newline at end of file diff --git a/drkaiser.c b/drkaiser.c index ac49df3..ab527e7 100644 --- a/drkaiser.c +++ b/drkaiser.c @@ -93,3 +93,13 @@ { return pci_mmio_readb(drkaiser_bar + (addr & DRKAISER_MEMMAP_MASK)); } + +const struct programmer_entry programmer_drkaiser = { + .name = "drkaiser", + .type = PCI, + .devs.dev = drkaiser_pcidev, + .init = drkaiser_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; \ No newline at end of file diff --git a/dummyflasher.c b/dummyflasher.c index ec5060d..6dc6208 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -1079,3 +1079,14 @@ return 1; } #endif + +const struct programmer_entry programmer_dummy = { + .name = "dummy", + .type = OTHER, + /* FIXME */ + .devs.note = "Dummy device, does nothing and logs all accesses\n", + .init = dummy_init, + .map_flash_region = dummy_map, + .unmap_flash_region = dummy_unmap, + .delay = internal_delay, +}; \ No newline at end of file diff --git a/ene_lpc.c b/ene_lpc.c index b66e96e..705d65e 100644 --- a/ene_lpc.c +++ b/ene_lpc.c @@ -586,4 +586,14 @@ return 1; } +const struct programmer_entry programmer_ene_lpc = { + .name = "ene_lpc", + .type = OTHER, + .devs.note = "ENE LPC interface keyboard controller\n", + .init = ene_lpc_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; + #endif /* __i386__ || __x86_64__ */ diff --git a/ft2232_spi.c b/ft2232_spi.c index bdc6e37..63b3d07 100644 --- a/ft2232_spi.c +++ b/ft2232_spi.c @@ -638,4 +638,13 @@ return ret; } +const struct programmer_entry programmer_ft2232_spi = { + .name = "ft2232_spi", + .type = USB, + .devs.dev = devs_ft2232spi, + .init = ft2232_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif diff --git a/gfxnvidia.c b/gfxnvidia.c index d8ea4d6..8641120 100644 --- a/gfxnvidia.c +++ b/gfxnvidia.c @@ -119,3 +119,13 @@ { return pci_mmio_readb(nvidia_bar + (addr & GFXNVIDIA_MEMMAP_MASK)); } + +const struct programmer_entry programmer_gfxnvidia = { + .name = "gfxnvidia", + .type = PCI, + .devs.dev = gfx_nvidia, + .init = gfxnvidia_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; \ No newline at end of file diff --git a/internal.c b/internal.c index bdbe32d..82b8126 100644 --- a/internal.c +++ b/internal.c @@ -372,3 +372,13 @@ return ret; } + +const struct programmer_entry programmer_internal = { + .name = "internal", + .type = OTHER, + .devs.note = NULL, + .init = internal_init, + .map_flash_region = physmap, + .unmap_flash_region = physunmap, + .delay = internal_delay, +}; \ No newline at end of file diff --git a/it8212.c b/it8212.c index ac53a6f..a1bef84 100644 --- a/it8212.c +++ b/it8212.c @@ -80,3 +80,13 @@ { return pci_mmio_readb(it8212_bar + (addr & IT8212_MEMMAP_MASK)); } + +const struct programmer_entry programmer_it8212 = { + .name = "it8212", + .type = PCI, + .devs.dev = devs_it8212, + .init = it8212_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; \ No newline at end of file diff --git a/jlink_spi.c b/jlink_spi.c index 8b5cd2c..560058b 100644 --- a/jlink_spi.c +++ b/jlink_spi.c @@ -488,3 +488,13 @@ return 1; } + +const struct programmer_entry programmer_jlink_spi = { + .name = "jlink_spi", + .type = OTHER, + .init = jlink_spi_init, + .devs.note = "SEGGER J-Link and compatible devices\n", + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; \ No newline at end of file diff --git a/linux_mtd.c b/linux_mtd.c index 22702e9..8cdbc70 100644 --- a/linux_mtd.c +++ b/linux_mtd.c @@ -289,7 +289,7 @@ return 0; } -static struct opaque_master programmer_linux_mtd = { +static struct opaque_master linux_mtd_opaque_master = { /* max_data_{read,write} don't have any effect for this programmer */ .max_data_read = MAX_DATA_UNSPECIFIED, .max_data_write = MAX_DATA_UNSPECIFIED, @@ -404,10 +404,20 @@ if (register_shutdown(linux_mtd_shutdown, NULL)) goto linux_mtd_init_exit; - register_opaque_master(&programmer_linux_mtd); + register_opaque_master(&linux_mtd_opaque_master); ret = 0; linux_mtd_init_exit: free(param); return ret; } + +const struct programmer_entry programmer_linux_mtd = { + .name = "linux_mtd", + .type = OTHER, + .devs.note = "Device files /dev/mtd*\n", + .init = linux_mtd_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; \ No newline at end of file diff --git a/linux_spi.c b/linux_spi.c index 4668e7f..86ab81d 100644 --- a/linux_spi.c +++ b/linux_spi.c @@ -252,4 +252,14 @@ return 1; } +const struct programmer_entry programmer_linux_spi = { + .name = "linux_spi", + .type = OTHER, + .devs.note = "Device files /dev/spidev*.*\n", + .init = linux_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; + #endif // CONFIG_LINUX_SPI == 1 diff --git a/lspcon_i2c_spi.c b/lspcon_i2c_spi.c index b79e7f7..b74af0c 100644 --- a/lspcon_i2c_spi.c +++ b/lspcon_i2c_spi.c @@ -519,3 +519,13 @@ return ret; } + +const struct programmer_entry programmer_lspcon_i2c_spi = { + .name = "lspcon_i2c_spi", + .type = OTHER, + .devs.note = "Device files /dev/i2c-*.\n", + .init = lspcon_i2c_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; \ No newline at end of file diff --git a/mec1308.c b/mec1308.c index 1530d9b..8a9ca05 100644 --- a/mec1308.c +++ b/mec1308.c @@ -522,4 +522,15 @@ free(ctx_data); return 1; } + +const struct programmer_entry programmer_mec1308 = { + .name = "mec1308", + .type = OTHER, + .devs.note = "Microchip MEC1308 Embedded Controller.\n", + .init = mec1308_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; + #endif diff --git a/mstarddc_spi.c b/mstarddc_spi.c index c041bd3..0ddc2c5 100644 --- a/mstarddc_spi.c +++ b/mstarddc_spi.c @@ -227,4 +227,14 @@ return ret; } +const struct programmer_entry programmer_mstarddc_spi = { + .name = "mstarddc_spi", + .type = OTHER, + .devs.note = "MSTAR DDC devices addressable via /dev/i2c-* on Linux.\n", + .init = mstarddc_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; + #endif diff --git a/ni845x_spi.c b/ni845x_spi.c index 765da8a..5820542 100644 --- a/ni845x_spi.c +++ b/ni845x_spi.c @@ -634,3 +634,13 @@ return 0; } + +const struct programmer_entry programmer_ni845x_spi = { + .name = "ni845x_spi", + .type = OTHER, // choose other because NI-845x uses own USB implementation + .devs.note = "National Instruments USB-845x\n", + .init = ni845x_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; \ No newline at end of file diff --git a/nic3com.c b/nic3com.c index b7b967a..83709a0 100644 --- a/nic3com.c +++ b/nic3com.c @@ -139,6 +139,16 @@ return INB(io_base_addr + BIOS_ROM_DATA); } +const struct programmer_entry programmer_nic3com = { + .name = "nic3com", + .type = PCI, + .devs.dev = nics_3com, + .init = nic3com_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; + #else #error PCI port I/O access is not supported on this architecture yet. #endif diff --git a/nicintel.c b/nicintel.c index 4672890..b450405 100644 --- a/nicintel.c +++ b/nicintel.c @@ -115,3 +115,13 @@ { return pci_mmio_readb(nicintel_bar + (addr & NICINTEL_MEMMAP_MASK)); } + +const struct programmer_entry programmer_nicintel = { + .name = "nicintel", + .type = PCI, + .devs.dev = nics_intel, + .init = nicintel_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; \ No newline at end of file diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c index 4d45f79..59ef8f5 100644 --- a/nicintel_eeprom.c +++ b/nicintel_eeprom.c @@ -501,3 +501,13 @@ return 1; } + +const struct programmer_entry programmer_nicintel_eeprom = { + .name = "nicintel_eeprom", + .type = PCI, + .devs.dev = nics_intel_ee, + .init = nicintel_ee_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; \ No newline at end of file diff --git a/nicintel_spi.c b/nicintel_spi.c index 1173ef7..3bc1045 100644 --- a/nicintel_spi.c +++ b/nicintel_spi.c @@ -278,3 +278,13 @@ return 0; } + +const struct programmer_entry programmer_nicintel_spi = { + .name = "nicintel_spi", + .type = PCI, + .devs.dev = nics_intel_spi, + .init = nicintel_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; \ No newline at end of file diff --git a/nicnatsemi.c b/nicnatsemi.c index 085768d..65263ea 100644 --- a/nicnatsemi.c +++ b/nicnatsemi.c @@ -106,6 +106,16 @@ return INB(io_base_addr + BOOT_ROM_DATA); } +const struct programmer_entry programmer_nicnatsemi = { + .name = "nicnatsemi", + .type = PCI, + .devs.dev = nics_natsemi, + .init = nicnatsemi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; + #else #error PCI port I/O access is not supported on this architecture yet. #endif diff --git a/nicrealtek.c b/nicrealtek.c index 5454b63..09470f9 100644 --- a/nicrealtek.c +++ b/nicrealtek.c @@ -129,6 +129,17 @@ return val; } +const struct programmer_entry programmer_nicrealtek = { + /* This programmer works for Realtek RTL8139 and SMC 1211. */ + .name = "nicrealtek", + .type = PCI, + .devs.dev = nics_realtek, + .init = nicrealtek_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; + #else #error PCI port I/O access is not supported on this architecture yet. #endif diff --git a/ogp_spi.c b/ogp_spi.c index e603edb..f0233b7 100644 --- a/ogp_spi.c +++ b/ogp_spi.c @@ -140,3 +140,13 @@ return 0; } + +const struct programmer_entry programmer_ogp_spi = { + .name = "ogp_spi", + .type = PCI, + .devs.dev = ogp_spi, + .init = ogp_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; \ No newline at end of file diff --git a/pickit2_spi.c b/pickit2_spi.c index 0bc17af..efd7ac3 100644 --- a/pickit2_spi.c +++ b/pickit2_spi.c @@ -489,3 +489,13 @@ return 0; } + +const struct programmer_entry programmer_pickit2_spi = { + .name = "pickit2_spi", + .type = USB, + .devs.dev = devs_pickit2_spi, + .init = pickit2_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; \ No newline at end of file diff --git a/pony_spi.c b/pony_spi.c index ed9d326..a7eeee3 100644 --- a/pony_spi.c +++ b/pony_spi.c @@ -229,3 +229,14 @@ } return 0; } + +const struct programmer_entry programmer_pony_spi = { + .name = "pony_spi", + .type = OTHER, + /* FIXME */ + .devs.note = "Programmers compatible with SI-Prog, serbang or AJAWe\n", + .init = pony_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; \ No newline at end of file diff --git a/programmer.h b/programmer.h index de03d0e..0e747bc 100644 --- a/programmer.h +++ b/programmer.h @@ -177,6 +177,7 @@ extern const struct programmer_entry *programmer_table[]; extern const size_t programmer_table_size; +extern const struct programmer_entry *default_programmer; int programmer_init(enum programmer prog, const char *param); int programmer_shutdown(void); @@ -362,7 +363,7 @@ void probe_superio(void); int register_superio(struct superio s); extern enum chipbustype internal_buses_supported; -int internal_init(void); +extern const struct programmer_entry programmer_internal; #endif /* hwaccess.c */ @@ -400,146 +401,122 @@ /* dummyflasher.c */ #if CONFIG_DUMMY == 1 -int dummy_init(void); -void *dummy_map(const char *descr, uintptr_t phys_addr, size_t len); -void dummy_unmap(void *virt_addr, size_t len); +extern const struct programmer_entry programmer_dummy; #endif /* nic3com.c */ #if CONFIG_NIC3COM == 1 -int nic3com_init(void); -extern const struct dev_entry nics_3com[]; +extern const struct programmer_entry programmer_nic3com; #endif /* gfxnvidia.c */ #if CONFIG_GFXNVIDIA == 1 -int gfxnvidia_init(void); -extern const struct dev_entry gfx_nvidia[]; +extern const struct programmer_entry programmer_gfxnvidia; #endif /* raiden_debug_spi.c */ #if CONFIG_RAIDEN_DEBUG_SPI == 1 -int raiden_debug_spi_init(void); -extern const struct dev_entry devs_raiden[]; +extern const struct programmer_entry programmer_raiden_debug_spi; #endif /* drkaiser.c */ #if CONFIG_DRKAISER == 1 -int drkaiser_init(void); -extern const struct dev_entry drkaiser_pcidev[]; +extern const struct programmer_entry programmer_drkaiser; #endif /* nicrealtek.c */ #if CONFIG_NICREALTEK == 1 -int nicrealtek_init(void); -extern const struct dev_entry nics_realtek[]; +extern const struct programmer_entry programmer_nicrealtek; #endif /* nicnatsemi.c */ #if CONFIG_NICNATSEMI == 1 -int nicnatsemi_init(void); -extern const struct dev_entry nics_natsemi[]; +extern const struct programmer_entry programmer_nicnatsemi; #endif /* nicintel.c */ #if CONFIG_NICINTEL == 1 -int nicintel_init(void); -extern const struct dev_entry nics_intel[]; +extern const struct programmer_entry programmer_nicintel; #endif /* nicintel_spi.c */ #if CONFIG_NICINTEL_SPI == 1 -int nicintel_spi_init(void); -extern const struct dev_entry nics_intel_spi[]; +extern const struct programmer_entry programmer_nicintel_spi; #endif /* nicintel_eeprom.c */ #if CONFIG_NICINTEL_EEPROM == 1 -int nicintel_ee_init(void); -extern const struct dev_entry nics_intel_ee[]; +extern const struct programmer_entry programmer_nicintel_eeprom; #endif /* ogp_spi.c */ #if CONFIG_OGP_SPI == 1 -int ogp_spi_init(void); -extern const struct dev_entry ogp_spi[]; +extern const struct programmer_entry programmer_ogp_spi; #endif /* satamv.c */ #if CONFIG_SATAMV == 1 -int satamv_init(void); -extern const struct dev_entry satas_mv[]; +extern const struct programmer_entry programmer_satamv; #endif /* satasii.c */ #if CONFIG_SATASII == 1 -int satasii_init(void); -extern const struct dev_entry satas_sii[]; +extern const struct programmer_entry programmer_satasii; #endif /* atahpt.c */ #if CONFIG_ATAHPT == 1 -int atahpt_init(void); -extern const struct dev_entry ata_hpt[]; +extern const struct programmer_entry programmer_atahpt; #endif /* atavia.c */ #if CONFIG_ATAVIA == 1 -int atavia_init(void); -void *atavia_map(const char *descr, uintptr_t phys_addr, size_t len); -extern const struct dev_entry ata_via[]; +extern const struct programmer_entry programmer_atavia; #endif /* atapromise.c */ #if CONFIG_ATAPROMISE == 1 -int atapromise_init(void); -void *atapromise_map(const char *descr, uintptr_t phys_addr, size_t len); -extern const struct dev_entry ata_promise[]; +extern const struct programmer_entry programmer_atapromise; #endif /* it8212.c */ #if CONFIG_IT8212 == 1 -int it8212_init(void); -extern const struct dev_entry devs_it8212[]; +extern const struct programmer_entry programmer_it8212; #endif /* ft2232_spi.c */ #if CONFIG_FT2232_SPI == 1 -int ft2232_spi_init(void); -extern const struct dev_entry devs_ft2232spi[]; +extern const struct programmer_entry programmer_ft2232_spi; #endif /* usbblaster_spi.c */ #if CONFIG_USBBLASTER_SPI == 1 -int usbblaster_spi_init(void); -extern const struct dev_entry devs_usbblasterspi[]; +extern const struct programmer_entry programmer_usbblaster_spi; #endif /* mstarddc_spi.c */ #if CONFIG_MSTARDDC_SPI == 1 -int mstarddc_spi_init(void); +extern const struct programmer_entry programmer_mstarddc_spi; #endif /* pickit2_spi.c */ #if CONFIG_PICKIT2_SPI == 1 -int pickit2_spi_init(void); -extern const struct dev_entry devs_pickit2_spi[]; +extern const struct programmer_entry programmer_pickit2_spi; #endif /* stlinkv3_spi.c */ #if CONFIG_STLINKV3_SPI == 1 -int stlinkv3_spi_init(void); -extern const struct dev_entry devs_stlinkv3_spi[]; +extern const struct programmer_entry programmer_stlinkv3_spi; #endif /* rayer_spi.c */ #if CONFIG_RAYER_SPI == 1 -int rayer_spi_init(void); +extern const struct programmer_entry programmer_rayer_spi; #endif /* pony_spi.c */ #if CONFIG_PONY_SPI == 1 -int pony_spi_init(void); +extern const struct programmer_entry programmer_pony_spi; #endif /* bitbang_spi.c */ @@ -547,57 +524,52 @@ /* buspirate_spi.c */ #if CONFIG_BUSPIRATE_SPI == 1 -int buspirate_spi_init(void); +extern const struct programmer_entry programmer_buspirate_spi; #endif /* linux_mtd.c */ #if CONFIG_LINUX_MTD == 1 -int linux_mtd_init(void); +extern const struct programmer_entry programmer_linux_mtd; #endif /* linux_spi.c */ #if CONFIG_LINUX_SPI == 1 -int linux_spi_init(void); +extern const struct programmer_entry programmer_linux_spi; #endif /* dediprog.c */ #if CONFIG_DEDIPROG == 1 -int dediprog_init(void); -extern const struct dev_entry devs_dediprog[]; +extern const struct programmer_entry programmer_dediprog; #endif /* developerbox_spi.c */ #if CONFIG_DEVELOPERBOX_SPI == 1 -int developerbox_spi_init(void); -extern const struct dev_entry devs_developerbox_spi[]; +extern const struct programmer_entry programmer_developerbox; #endif /* ch341a_spi.c */ #if CONFIG_CH341A_SPI == 1 -int ch341a_spi_init(void); -void ch341a_spi_delay(unsigned int usecs); -extern const struct dev_entry devs_ch341a_spi[]; +extern const struct programmer_entry programmer_ch341a_spi; #endif /* digilent_spi.c */ #if CONFIG_DIGILENT_SPI == 1 -int digilent_spi_init(void); -extern const struct dev_entry devs_digilent_spi[]; +extern const struct programmer_entry programmer_digilent_spi; #endif /* ene_lpc.c */ #if CONFIG_ENE_LPC == 1 -int ene_lpc_init(void); +extern const struct programmer_entry programmer_ene_lpc; #endif /* jlink_spi.c */ #if CONFIG_JLINK_SPI == 1 -int jlink_spi_init(void); +extern const struct programmer_entry programmer_jlink_spi; #endif /* ni845x_spi.c */ #if CONFIG_NI845X_SPI == 1 -int ni845x_spi_init(void); +extern const struct programmer_entry programmer_ni845x_spi; #endif /* flashrom.c */ @@ -694,7 +666,7 @@ #if CONFIG_LINUX_MTD == 1 /* trivial wrapper to avoid cluttering internal_init() with #if */ -static inline int try_mtd(void) { return linux_mtd_init(); }; +static inline int try_mtd(void) { return programmer_linux_mtd.init(); }; #else static inline int try_mtd(void) { return 1; }; #endif @@ -704,7 +676,7 @@ /* mec1308.c */ #if CONFIG_MEC1308 == 1 -int mec1308_init(void); +extern const struct programmer_entry programmer_mec1308; #endif /* sb600spi.c */ @@ -762,9 +734,7 @@ /* serprog.c */ #if CONFIG_SERPROG == 1 -int serprog_init(void); -void serprog_delay(unsigned int usecs); -void *serprog_map(const char *descr, uintptr_t phys_addr, size_t len); +extern const struct programmer_entry programmer_serprog; #endif /* serial.c */ @@ -835,12 +805,12 @@ /* lspcon_i2c_spi.c */ #if CONFIG_LSPCON_I2C_SPI == 1 -int lspcon_i2c_spi_init(void); +extern const struct programmer_entry programmer_lspcon_i2c_spi; #endif /* realtek_mst_i2c_spi.c */ #if CONFIG_REALTEK_MST_I2C_SPI == 1 -int realtek_mst_i2c_spi_init(void); +extern const struct programmer_entry programmer_realtek_mst_i2c_spi; #endif #endif /* !__PROGRAMMER_H__ */ diff --git a/programmer_table.c b/programmer_table.c index 2465d9e..e8745f2 100644 --- a/programmer_table.c +++ b/programmer_table.c @@ -1,479 +1,5 @@ #include "programmer.h" -#if CONFIG_INTERNAL == 1 -const struct programmer_entry programmer_internal = { - .name = "internal", - .type = OTHER, - .devs.note = NULL, - .init = internal_init, - .map_flash_region = physmap, - .unmap_flash_region = physunmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_DUMMY == 1 -const struct programmer_entry programmer_dummy = { - .name = "dummy", - .type = OTHER, - /* FIXME */ - .devs.note = "Dummy device, does nothing and logs all accesses\n", - .init = dummy_init, - .map_flash_region = dummy_map, - .unmap_flash_region = dummy_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_MEC1308 == 1 -const struct programmer_entry programmer_mec1308 = { - .name = "mec1308", - .type = OTHER, - .devs.note = "Microchip MEC1308 Embedded Controller.\n", - .init = mec1308_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_NIC3COM == 1 -const struct programmer_entry programmer_nic3com = { - .name = "nic3com", - .type = PCI, - .devs.dev = nics_3com, - .init = nic3com_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_NICREALTEK == 1 -const struct programmer_entry programmer_nicrealtek = { - /* This programmer works for Realtek RTL8139 and SMC 1211. */ - .name = "nicrealtek", - .type = PCI, - .devs.dev = nics_realtek, - .init = nicrealtek_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_NICNATSEMI == 1 -const struct programmer_entry programmer_nicnatsemi = { - .name = "nicnatsemi", - .type = PCI, - .devs.dev = nics_natsemi, - .init = nicnatsemi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_GFXNVIDIA == 1 -const struct programmer_entry programmer_gfxnvidia = { - .name = "gfxnvidia", - .type = PCI, - .devs.dev = gfx_nvidia, - .init = gfxnvidia_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_RAIDEN_DEBUG_SPI == 1 -const struct programmer_entry programmer_raiden_debug_spi = { - .name = "raiden_debug_spi", - .type = USB, - .devs.dev = devs_raiden, - .init = raiden_debug_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_DRKAISER == 1 -const struct programmer_entry programmer_drkaiser = { - .name = "drkaiser", - .type = PCI, - .devs.dev = drkaiser_pcidev, - .init = drkaiser_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_SATASII == 1 -const struct programmer_entry programmer_satasii = { - .name = "satasii", - .type = PCI, - .devs.dev = satas_sii, - .init = satasii_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_ATAHPT == 1 -const struct programmer_entry programmer_atahpt = { - .name = "atahpt", - .type = PCI, - .devs.dev = ata_hpt, - .init = atahpt_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_ATAVIA == 1 -const struct programmer_entry programmer_atavia = { - .name = "atavia", - .type = PCI, - .devs.dev = ata_via, - .init = atavia_init, - .map_flash_region = atavia_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_ATAPROMISE == 1 -const struct programmer_entry programmer_atapromise = { - .name = "atapromise", - .type = PCI, - .devs.dev = ata_promise, - .init = atapromise_init, - .map_flash_region = atapromise_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_IT8212 == 1 -const struct programmer_entry programmer_it8212 = { - .name = "it8212", - .type = PCI, - .devs.dev = devs_it8212, - .init = it8212_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_FT2232_SPI == 1 -const struct programmer_entry programmer_ft2232_spi = { - .name = "ft2232_spi", - .type = USB, - .devs.dev = devs_ft2232spi, - .init = ft2232_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_SERPROG == 1 -const struct programmer_entry programmer_serprog = { - .name = "serprog", - .type = OTHER, - /* FIXME */ - .devs.note = "All programmer devices speaking the serprog protocol\n", - .init = serprog_init, - .map_flash_region = serprog_map, - .unmap_flash_region = fallback_unmap, - .delay = serprog_delay, -}; -#endif - -#if CONFIG_BUSPIRATE_SPI == 1 -const struct programmer_entry programmer_buspirate_spi = { - .name = "buspirate_spi", - .type = OTHER, - /* FIXME */ - .devs.note = "Dangerous Prototypes Bus Pirate\n", - .init = buspirate_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_DEDIPROG == 1 -const struct programmer_entry programmer_dediprog = { - .name = "dediprog", - .type = USB, - .devs.dev = devs_dediprog, - .init = dediprog_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_DEVELOPERBOX_SPI == 1 -const struct programmer_entry programmer_developerbox = { - .name = "developerbox", - .type = USB, - .devs.dev = devs_developerbox_spi, - .init = developerbox_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_ENE_LPC == 1 -const struct programmer_entry programmer_ene_lpc = { - .name = "ene_lpc", - .type = OTHER, - .devs.note = "ENE LPC interface keyboard controller\n", - .init = ene_lpc_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_RAYER_SPI == 1 -const struct programmer_entry programmer_rayer_spi = { - .name = "rayer_spi", - .type = OTHER, - /* FIXME */ - .devs.note = "RayeR parallel port programmer\n", - .init = rayer_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_PONY_SPI == 1 -const struct programmer_entry programmer_pony_spi = { - .name = "pony_spi", - .type = OTHER, - /* FIXME */ - .devs.note = "Programmers compatible with SI-Prog, serbang or AJAWe\n", - .init = pony_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_NICINTEL == 1 -const struct programmer_entry programmer_nicintel = { - .name = "nicintel", - .type = PCI, - .devs.dev = nics_intel, - .init = nicintel_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_NICINTEL_SPI == 1 -const struct programmer_entry programmer_nicintel_spi = { - .name = "nicintel_spi", - .type = PCI, - .devs.dev = nics_intel_spi, - .init = nicintel_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_NICINTEL_EEPROM == 1 -const struct programmer_entry programmer_nicintel_eeprom = { - .name = "nicintel_eeprom", - .type = PCI, - .devs.dev = nics_intel_ee, - .init = nicintel_ee_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_OGP_SPI == 1 -const struct programmer_entry programmer_ogp_spi = { - .name = "ogp_spi", - .type = PCI, - .devs.dev = ogp_spi, - .init = ogp_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_SATAMV == 1 -const struct programmer_entry programmer_satamv = { - .name = "satamv", - .type = PCI, - .devs.dev = satas_mv, - .init = satamv_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_LINUX_MTD == 1 -const struct programmer_entry programmer_linux_mtd = { - .name = "linux_mtd", - .type = OTHER, - .devs.note = "Device files /dev/mtd*\n", - .init = linux_mtd_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_LINUX_SPI == 1 -const struct programmer_entry programmer_linux_spi = { - .name = "linux_spi", - .type = OTHER, - .devs.note = "Device files /dev/spidev*.*\n", - .init = linux_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_LSPCON_I2C_SPI == 1 -const struct programmer_entry programmer_lspcon_i2c_spi = { - .name = "lspcon_i2c_spi", - .type = OTHER, - .devs.note = "Device files /dev/i2c-*.\n", - .init = lspcon_i2c_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_REALTEK_MST_I2C_SPI == 1 -const struct programmer_entry programmer_realtek_mst_i2c_spi = { - .name = "realtek_mst_i2c_spi", - .type = OTHER, - .devs.note = "Device files /dev/i2c-*.\n", - .init = realtek_mst_i2c_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_USBBLASTER_SPI == 1 -const struct programmer_entry programmer_usbblaster_spi = { - .name = "usbblaster_spi", - .type = USB, - .devs.dev = devs_usbblasterspi, - .init = usbblaster_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_MSTARDDC_SPI == 1 -const struct programmer_entry programmer_mstarddc_spi = { - .name = "mstarddc_spi", - .type = OTHER, - .devs.note = "MSTAR DDC devices addressable via /dev/i2c-* on Linux.\n", - .init = mstarddc_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_PICKIT2_SPI == 1 -const struct programmer_entry programmer_pickit2_spi = { - .name = "pickit2_spi", - .type = USB, - .devs.dev = devs_pickit2_spi, - .init = pickit2_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_CH341A_SPI == 1 -const struct programmer_entry programmer_ch341a_spi = { - .name = "ch341a_spi", - .type = USB, - .devs.dev = devs_ch341a_spi, - .init = ch341a_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = ch341a_spi_delay, -}; -#endif - -#if CONFIG_DIGILENT_SPI == 1 -const struct programmer_entry programmer_digilent_spi = { - .name = "digilent_spi", - .type = USB, - .devs.dev = devs_digilent_spi, - .init = digilent_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_JLINK_SPI == 1 -const struct programmer_entry programmer_jlink_spi = { - .name = "jlink_spi", - .type = OTHER, - .init = jlink_spi_init, - .devs.note = "SEGGER J-Link and compatible devices\n", - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_NI845X_SPI == 1 -const struct programmer_entry programmer_ni845x_spi = { - .name = "ni845x_spi", - .type = OTHER, // choose other because NI-845x uses own USB implementation - .devs.note = "National Instruments USB-845x\n", - .init = ni845x_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - -#if CONFIG_STLINKV3_SPI == 1 -const struct programmer_entry programmer_stlinkv3_spi = { - .name = "stlinkv3_spi", - .type = USB, - .devs.dev = devs_stlinkv3_spi, - .init = stlinkv3_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, -}; -#endif - const struct programmer_entry *programmer_table[] = { #if CONFIG_INTERNAL == 1 @@ -636,3 +162,11 @@ }; const size_t programmer_table_size = ARRAY_SIZE(programmer_table); + +#ifdef FOO //CONFIG_DEFAULT_PROGRAMMER +#define DEFAULT_PROGRAMMER &programmer_##CONFIG_DEFAULT_PROGRAMMER +#else +#define DEFAULT_PROGRAMMER NULL +#endif + +const struct programmer_entry *default_programmer = DEFAULT_PROGRAMMER; diff --git a/raiden_debug_spi.c b/raiden_debug_spi.c index bd7c054..a1a3d32 100644 --- a/raiden_debug_spi.c +++ b/raiden_debug_spi.c @@ -1619,3 +1619,13 @@ return 0; } + +const struct programmer_entry programmer_raiden_debug_spi = { + .name = "raiden_debug_spi", + .type = USB, + .devs.dev = devs_raiden, + .init = raiden_debug_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; \ No newline at end of file diff --git a/rayer_spi.c b/rayer_spi.c index cde008f..6f91dfa 100644 --- a/rayer_spi.c +++ b/rayer_spi.c @@ -271,6 +271,17 @@ return 0; } +const struct programmer_entry programmer_rayer_spi = { + .name = "rayer_spi", + .type = OTHER, + /* FIXME */ + .devs.note = "RayeR parallel port programmer\n", + .init = rayer_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; + #else #error PCI port I/O access is not supported on this architecture yet. #endif diff --git a/realtek_mst_i2c_spi.c b/realtek_mst_i2c_spi.c index ae79fdd..23dc74c 100644 --- a/realtek_mst_i2c_spi.c +++ b/realtek_mst_i2c_spi.c @@ -548,3 +548,13 @@ return ret; } + +const struct programmer_entry programmer_realtek_mst_i2c_spi = { + .name = "realtek_mst_i2c_spi", + .type = OTHER, + .devs.note = "Device files /dev/i2c-*.\n", + .init = realtek_mst_i2c_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; \ No newline at end of file diff --git a/satamv.c b/satamv.c index 31265ea..f89c5aa 100644 --- a/satamv.c +++ b/satamv.c @@ -188,6 +188,16 @@ return satamv_indirect_chip_readb(addr); } +const struct programmer_entry programmer_satamv = { + .name = "satamv", + .type = PCI, + .devs.dev = satas_mv, + .init = satamv_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; + #else #error PCI port I/O access is not supported on this architecture yet. #endif diff --git a/satasii.c b/satasii.c index 8a0938d..64385ee 100644 --- a/satasii.c +++ b/satasii.c @@ -135,3 +135,13 @@ return (pci_mmio_readl(sii_bar + 4)) & 0xff; } + +const struct programmer_entry programmer_satasii = { + .name = "satasii", + .type = PCI, + .devs.dev = satas_sii, + .init = satasii_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; \ No newline at end of file diff --git a/serprog.c b/serprog.c index d583a40..2a8a5b1 100644 --- a/serprog.c +++ b/serprog.c @@ -924,3 +924,14 @@ descr, len, PRIxPTR_WIDTH, phys_addr); return NULL; } + +const struct programmer_entry programmer_serprog = { + .name = "serprog", + .type = OTHER, + /* FIXME */ + .devs.note = "All programmer devices speaking the serprog protocol\n", + .init = serprog_init, + .map_flash_region = serprog_map, + .unmap_flash_region = fallback_unmap, + .delay = serprog_delay, +}; \ No newline at end of file diff --git a/stlinkv3_spi.c b/stlinkv3_spi.c index 7e8336e..133a823 100644 --- a/stlinkv3_spi.c +++ b/stlinkv3_spi.c @@ -518,3 +518,13 @@ libusb_exit(usb_ctx); return 1; } + +const struct programmer_entry programmer_stlinkv3_spi = { + .name = "stlinkv3_spi", + .type = USB, + .devs.dev = devs_stlinkv3_spi, + .init = stlinkv3_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; \ No newline at end of file diff --git a/usbblaster_spi.c b/usbblaster_spi.c index 020c3bf..9121543 100644 --- a/usbblaster_spi.c +++ b/usbblaster_spi.c @@ -214,4 +214,14 @@ return 0; } +const struct programmer_entry programmer_usbblaster_spi = { + .name = "usbblaster_spi", + .type = USB, + .devs.dev = devs_usbblasterspi, + .init = usbblaster_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; + #endif -- To view, visit https://review.coreboot.org/c/flashrom/+/52946 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3d02bd789f0299e936eb86819b3b15b5ea2bb921 Gerrit-Change-Number: 52946 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: programmer_table: move the array to an own file
by Thomas Heijligen (Code Review) 05 May '21

05 May '21

Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/52944 ) Change subject: programmer_table: move the array to an own file ...................................................................... programmer_table: move the array to an own file Change-Id: I8e6d704e845ee4152c8676dd19dff0934fff007b Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> --- M Makefile M flashrom.c M meson.build M programmer.h A programmer_table.c 5 files changed, 486 insertions(+), 480 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/44/52944/1 diff --git a/Makefile b/Makefile index dd19e14..73e975a 100644 --- a/Makefile +++ b/Makefile @@ -653,7 +653,7 @@ ############################################################################### # Library code. -LIB_OBJS = libflashrom.o layout.o flashrom.o udelay.o programmer.o helpers.o ich_descriptors.o fmap.o +LIB_OBJS = libflashrom.o layout.o flashrom.o udelay.o programmer.o programmer_table.o helpers.o ich_descriptors.o fmap.o ############################################################################### # Frontend related stuff. diff --git a/flashrom.c b/flashrom.c index 0af5057..6bcb737 100644 --- a/flashrom.c +++ b/flashrom.c @@ -58,484 +58,6 @@ /* Is writing allowed with this programmer? */ int programmer_may_write; -const struct programmer_entry programmer_table[] = { -#if CONFIG_INTERNAL == 1 - { - .name = "internal", - .type = OTHER, - .devs.note = NULL, - .init = internal_init, - .map_flash_region = physmap, - .unmap_flash_region = physunmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_DUMMY == 1 - { - .name = "dummy", - .type = OTHER, - /* FIXME */ - .devs.note = "Dummy device, does nothing and logs all accesses\n", - .init = dummy_init, - .map_flash_region = dummy_map, - .unmap_flash_region = dummy_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_MEC1308 == 1 - { - .name = "mec1308", - .type = OTHER, - .devs.note = "Microchip MEC1308 Embedded Controller.\n", - .init = mec1308_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_NIC3COM == 1 - { - .name = "nic3com", - .type = PCI, - .devs.dev = nics_3com, - .init = nic3com_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_NICREALTEK == 1 - { - /* This programmer works for Realtek RTL8139 and SMC 1211. */ - .name = "nicrealtek", - .type = PCI, - .devs.dev = nics_realtek, - .init = nicrealtek_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_NICNATSEMI == 1 - { - .name = "nicnatsemi", - .type = PCI, - .devs.dev = nics_natsemi, - .init = nicnatsemi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_GFXNVIDIA == 1 - { - .name = "gfxnvidia", - .type = PCI, - .devs.dev = gfx_nvidia, - .init = gfxnvidia_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_RAIDEN_DEBUG_SPI == 1 - { - .name = "raiden_debug_spi", - .type = USB, - .devs.dev = devs_raiden, - .init = raiden_debug_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_DRKAISER == 1 - { - .name = "drkaiser", - .type = PCI, - .devs.dev = drkaiser_pcidev, - .init = drkaiser_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_SATASII == 1 - { - .name = "satasii", - .type = PCI, - .devs.dev = satas_sii, - .init = satasii_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_ATAHPT == 1 - { - .name = "atahpt", - .type = PCI, - .devs.dev = ata_hpt, - .init = atahpt_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_ATAVIA == 1 - { - .name = "atavia", - .type = PCI, - .devs.dev = ata_via, - .init = atavia_init, - .map_flash_region = atavia_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_ATAPROMISE == 1 - { - .name = "atapromise", - .type = PCI, - .devs.dev = ata_promise, - .init = atapromise_init, - .map_flash_region = atapromise_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_IT8212 == 1 - { - .name = "it8212", - .type = PCI, - .devs.dev = devs_it8212, - .init = it8212_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_FT2232_SPI == 1 - { - .name = "ft2232_spi", - .type = USB, - .devs.dev = devs_ft2232spi, - .init = ft2232_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_SERPROG == 1 - { - .name = "serprog", - .type = OTHER, - /* FIXME */ - .devs.note = "All programmer devices speaking the serprog protocol\n", - .init = serprog_init, - .map_flash_region = serprog_map, - .unmap_flash_region = fallback_unmap, - .delay = serprog_delay, - }, -#endif - -#if CONFIG_BUSPIRATE_SPI == 1 - { - .name = "buspirate_spi", - .type = OTHER, - /* FIXME */ - .devs.note = "Dangerous Prototypes Bus Pirate\n", - .init = buspirate_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_DEDIPROG == 1 - { - .name = "dediprog", - .type = USB, - .devs.dev = devs_dediprog, - .init = dediprog_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_DEVELOPERBOX_SPI == 1 - { - .name = "developerbox", - .type = USB, - .devs.dev = devs_developerbox_spi, - .init = developerbox_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_ENE_LPC == 1 - { - .name = "ene_lpc", - .type = OTHER, - .devs.note = "ENE LPC interface keyboard controller\n", - .init = ene_lpc_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_RAYER_SPI == 1 - { - .name = "rayer_spi", - .type = OTHER, - /* FIXME */ - .devs.note = "RayeR parallel port programmer\n", - .init = rayer_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_PONY_SPI == 1 - { - .name = "pony_spi", - .type = OTHER, - /* FIXME */ - .devs.note = "Programmers compatible with SI-Prog, serbang or AJAWe\n", - .init = pony_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_NICINTEL == 1 - { - .name = "nicintel", - .type = PCI, - .devs.dev = nics_intel, - .init = nicintel_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_NICINTEL_SPI == 1 - { - .name = "nicintel_spi", - .type = PCI, - .devs.dev = nics_intel_spi, - .init = nicintel_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_NICINTEL_EEPROM == 1 - { - .name = "nicintel_eeprom", - .type = PCI, - .devs.dev = nics_intel_ee, - .init = nicintel_ee_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_OGP_SPI == 1 - { - .name = "ogp_spi", - .type = PCI, - .devs.dev = ogp_spi, - .init = ogp_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_SATAMV == 1 - { - .name = "satamv", - .type = PCI, - .devs.dev = satas_mv, - .init = satamv_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_LINUX_MTD == 1 - { - .name = "linux_mtd", - .type = OTHER, - .devs.note = "Device files /dev/mtd*\n", - .init = linux_mtd_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_LINUX_SPI == 1 - { - .name = "linux_spi", - .type = OTHER, - .devs.note = "Device files /dev/spidev*.*\n", - .init = linux_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_LSPCON_I2C_SPI == 1 - { - .name = "lspcon_i2c_spi", - .type = OTHER, - .devs.note = "Device files /dev/i2c-*.\n", - .init = lspcon_i2c_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_REALTEK_MST_I2C_SPI == 1 - { - .name = "realtek_mst_i2c_spi", - .type = OTHER, - .devs.note = "Device files /dev/i2c-*.\n", - .init = realtek_mst_i2c_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_USBBLASTER_SPI == 1 - { - .name = "usbblaster_spi", - .type = USB, - .devs.dev = devs_usbblasterspi, - .init = usbblaster_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_MSTARDDC_SPI == 1 - { - .name = "mstarddc_spi", - .type = OTHER, - .devs.note = "MSTAR DDC devices addressable via /dev/i2c-* on Linux.\n", - .init = mstarddc_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_PICKIT2_SPI == 1 - { - .name = "pickit2_spi", - .type = USB, - .devs.dev = devs_pickit2_spi, - .init = pickit2_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_CH341A_SPI == 1 - { - .name = "ch341a_spi", - .type = USB, - .devs.dev = devs_ch341a_spi, - .init = ch341a_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = ch341a_spi_delay, - }, -#endif - -#if CONFIG_DIGILENT_SPI == 1 - { - .name = "digilent_spi", - .type = USB, - .devs.dev = devs_digilent_spi, - .init = digilent_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_JLINK_SPI == 1 - { - .name = "jlink_spi", - .type = OTHER, - .init = jlink_spi_init, - .devs.note = "SEGGER J-Link and compatible devices\n", - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_NI845X_SPI == 1 - { - .name = "ni845x_spi", - .type = OTHER, // choose other because NI-845x uses own USB implementation - .devs.note = "National Instruments USB-845x\n", - .init = ni845x_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - -#if CONFIG_STLINKV3_SPI == 1 - { - .name = "stlinkv3_spi", - .type = USB, - .devs.dev = devs_stlinkv3_spi, - .init = stlinkv3_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, -#endif - - {0}, /* This entry corresponds to PROGRAMMER_INVALID. */ -}; - #define SHUTDOWN_MAXFN 32 static int shutdown_fn_count = 0; /** @private */ @@ -2191,7 +1713,7 @@ /* Safety check. Instead of aborting after the first error, check * if more errors exist. */ - if (ARRAY_SIZE(programmer_table) - 1 != PROGRAMMER_INVALID) { + if (programmer_table_size - 1 != PROGRAMMER_INVALID) { msg_gerr("Programmer table miscompilation!\n"); ret = 1; } diff --git a/meson.build b/meson.build index 368820c..898a265 100644 --- a/meson.build +++ b/meson.build @@ -361,6 +361,7 @@ srcs += 'opaque.c' srcs += 'print.c' srcs += 'programmer.c' +srcs += 'programmer_table.c' srcs += 's25f.c' srcs += 'sfdp.c' srcs += 'spi25.c' diff --git a/programmer.h b/programmer.h index 29a100b..524d360 100644 --- a/programmer.h +++ b/programmer.h @@ -176,6 +176,7 @@ }; extern const struct programmer_entry programmer_table[]; +extern const size_t programmer_table_size; int programmer_init(enum programmer prog, const char *param); int programmer_shutdown(void); diff --git a/programmer_table.c b/programmer_table.c new file mode 100644 index 0000000..ae75bdc --- /dev/null +++ b/programmer_table.c @@ -0,0 +1,482 @@ +#include "programmer.h" + + +const struct programmer_entry programmer_table[] = { +#if CONFIG_INTERNAL == 1 + { + .name = "internal", + .type = OTHER, + .devs.note = NULL, + .init = internal_init, + .map_flash_region = physmap, + .unmap_flash_region = physunmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_DUMMY == 1 + { + .name = "dummy", + .type = OTHER, + /* FIXME */ + .devs.note = "Dummy device, does nothing and logs all accesses\n", + .init = dummy_init, + .map_flash_region = dummy_map, + .unmap_flash_region = dummy_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_MEC1308 == 1 + { + .name = "mec1308", + .type = OTHER, + .devs.note = "Microchip MEC1308 Embedded Controller.\n", + .init = mec1308_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_NIC3COM == 1 + { + .name = "nic3com", + .type = PCI, + .devs.dev = nics_3com, + .init = nic3com_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_NICREALTEK == 1 + { + /* This programmer works for Realtek RTL8139 and SMC 1211. */ + .name = "nicrealtek", + .type = PCI, + .devs.dev = nics_realtek, + .init = nicrealtek_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_NICNATSEMI == 1 + { + .name = "nicnatsemi", + .type = PCI, + .devs.dev = nics_natsemi, + .init = nicnatsemi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_GFXNVIDIA == 1 + { + .name = "gfxnvidia", + .type = PCI, + .devs.dev = gfx_nvidia, + .init = gfxnvidia_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_RAIDEN_DEBUG_SPI == 1 + { + .name = "raiden_debug_spi", + .type = USB, + .devs.dev = devs_raiden, + .init = raiden_debug_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_DRKAISER == 1 + { + .name = "drkaiser", + .type = PCI, + .devs.dev = drkaiser_pcidev, + .init = drkaiser_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_SATASII == 1 + { + .name = "satasii", + .type = PCI, + .devs.dev = satas_sii, + .init = satasii_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_ATAHPT == 1 + { + .name = "atahpt", + .type = PCI, + .devs.dev = ata_hpt, + .init = atahpt_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_ATAVIA == 1 + { + .name = "atavia", + .type = PCI, + .devs.dev = ata_via, + .init = atavia_init, + .map_flash_region = atavia_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_ATAPROMISE == 1 + { + .name = "atapromise", + .type = PCI, + .devs.dev = ata_promise, + .init = atapromise_init, + .map_flash_region = atapromise_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_IT8212 == 1 + { + .name = "it8212", + .type = PCI, + .devs.dev = devs_it8212, + .init = it8212_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_FT2232_SPI == 1 + { + .name = "ft2232_spi", + .type = USB, + .devs.dev = devs_ft2232spi, + .init = ft2232_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_SERPROG == 1 + { + .name = "serprog", + .type = OTHER, + /* FIXME */ + .devs.note = "All programmer devices speaking the serprog protocol\n", + .init = serprog_init, + .map_flash_region = serprog_map, + .unmap_flash_region = fallback_unmap, + .delay = serprog_delay, + }, +#endif + +#if CONFIG_BUSPIRATE_SPI == 1 + { + .name = "buspirate_spi", + .type = OTHER, + /* FIXME */ + .devs.note = "Dangerous Prototypes Bus Pirate\n", + .init = buspirate_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_DEDIPROG == 1 + { + .name = "dediprog", + .type = USB, + .devs.dev = devs_dediprog, + .init = dediprog_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_DEVELOPERBOX_SPI == 1 + { + .name = "developerbox", + .type = USB, + .devs.dev = devs_developerbox_spi, + .init = developerbox_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_ENE_LPC == 1 + { + .name = "ene_lpc", + .type = OTHER, + .devs.note = "ENE LPC interface keyboard controller\n", + .init = ene_lpc_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_RAYER_SPI == 1 + { + .name = "rayer_spi", + .type = OTHER, + /* FIXME */ + .devs.note = "RayeR parallel port programmer\n", + .init = rayer_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_PONY_SPI == 1 + { + .name = "pony_spi", + .type = OTHER, + /* FIXME */ + .devs.note = "Programmers compatible with SI-Prog, serbang or AJAWe\n", + .init = pony_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_NICINTEL == 1 + { + .name = "nicintel", + .type = PCI, + .devs.dev = nics_intel, + .init = nicintel_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_NICINTEL_SPI == 1 + { + .name = "nicintel_spi", + .type = PCI, + .devs.dev = nics_intel_spi, + .init = nicintel_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_NICINTEL_EEPROM == 1 + { + .name = "nicintel_eeprom", + .type = PCI, + .devs.dev = nics_intel_ee, + .init = nicintel_ee_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_OGP_SPI == 1 + { + .name = "ogp_spi", + .type = PCI, + .devs.dev = ogp_spi, + .init = ogp_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_SATAMV == 1 + { + .name = "satamv", + .type = PCI, + .devs.dev = satas_mv, + .init = satamv_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_LINUX_MTD == 1 + { + .name = "linux_mtd", + .type = OTHER, + .devs.note = "Device files /dev/mtd*\n", + .init = linux_mtd_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_LINUX_SPI == 1 + { + .name = "linux_spi", + .type = OTHER, + .devs.note = "Device files /dev/spidev*.*\n", + .init = linux_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_LSPCON_I2C_SPI == 1 + { + .name = "lspcon_i2c_spi", + .type = OTHER, + .devs.note = "Device files /dev/i2c-*.\n", + .init = lspcon_i2c_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_REALTEK_MST_I2C_SPI == 1 + { + .name = "realtek_mst_i2c_spi", + .type = OTHER, + .devs.note = "Device files /dev/i2c-*.\n", + .init = realtek_mst_i2c_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_USBBLASTER_SPI == 1 + { + .name = "usbblaster_spi", + .type = USB, + .devs.dev = devs_usbblasterspi, + .init = usbblaster_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_MSTARDDC_SPI == 1 + { + .name = "mstarddc_spi", + .type = OTHER, + .devs.note = "MSTAR DDC devices addressable via /dev/i2c-* on Linux.\n", + .init = mstarddc_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_PICKIT2_SPI == 1 + { + .name = "pickit2_spi", + .type = USB, + .devs.dev = devs_pickit2_spi, + .init = pickit2_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_CH341A_SPI == 1 + { + .name = "ch341a_spi", + .type = USB, + .devs.dev = devs_ch341a_spi, + .init = ch341a_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = ch341a_spi_delay, + }, +#endif + +#if CONFIG_DIGILENT_SPI == 1 + { + .name = "digilent_spi", + .type = USB, + .devs.dev = devs_digilent_spi, + .init = digilent_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_JLINK_SPI == 1 + { + .name = "jlink_spi", + .type = OTHER, + .init = jlink_spi_init, + .devs.note = "SEGGER J-Link and compatible devices\n", + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_NI845X_SPI == 1 + { + .name = "ni845x_spi", + .type = OTHER, // choose other because NI-845x uses own USB implementation + .devs.note = "National Instruments USB-845x\n", + .init = ni845x_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + +#if CONFIG_STLINKV3_SPI == 1 + { + .name = "stlinkv3_spi", + .type = USB, + .devs.dev = devs_stlinkv3_spi, + .init = stlinkv3_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + + {0}, /* This entry corresponds to PROGRAMMER_INVALID. */ +}; + +const size_t programmer_table_size = ARRAY_SIZE(programmer_table); \ No newline at end of file -- To view, visit https://review.coreboot.org/c/flashrom/+/52944 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I8e6d704e845ee4152c8676dd19dff0934fff007b Gerrit-Change-Number: 52944 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: programmer_table: making entries a pointer
by Thomas Heijligen (Code Review) 05 May '21

05 May '21

Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/52945 ) Change subject: programmer_table: making entries a pointer ...................................................................... programmer_table: making entries a pointer Change-Id: Ifbb0ee4db5a85b1cd2afeafe4dca838579f79878 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> --- M cli_classic.c M flashrom.c M libflashrom.c M print.c M print_wiki.c M programmer.h M programmer_table.c 7 files changed, 569 insertions(+), 413 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/45/52945/1 diff --git a/cli_classic.c b/cli_classic.c index 5fd8092..bc2d40d 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -407,7 +407,7 @@ "for details.\n"); } for (prog = 0; prog < PROGRAMMER_INVALID; prog++) { - name = programmer_table[prog].name; + name = programmer_table[prog]->name; namelen = strlen(name); if (strncmp(optarg, name, namelen) == 0) { switch (optarg[namelen]) { @@ -545,7 +545,7 @@ /* We need to strdup here because we free(pparam) unconditionally later. */ pparam = strdup(CONFIG_DEFAULT_PROGRAMMER_ARGS); msg_pinfo("Using default programmer \"%s\" with arguments \"%s\".\n", - programmer_table[CONFIG_DEFAULT_PROGRAMMER].name, pparam); + programmer_table[CONFIG_DEFAULT_PROGRAMMER]->name, pparam); } else { msg_perr("Please select a programmer with the --programmer parameter.\n" #if CONFIG_INTERNAL == 1 diff --git a/flashrom.c b/flashrom.c index 6bcb737..8ee729c 100644 --- a/flashrom.c +++ b/flashrom.c @@ -155,8 +155,8 @@ programmer_may_write = 1; programmer_param = param; - msg_pdbg("Initializing %s programmer\n", programmer_table[programmer].name); - ret = programmer_table[programmer].init(); + msg_pdbg("Initializing %s programmer\n", programmer_table[programmer]->name); + ret = programmer_table[programmer]->init(); if (programmer_param && strlen(programmer_param)) { if (ret != 0) { /* It is quite possible that any unhandled programmer parameter would have been valid, @@ -200,7 +200,7 @@ void *programmer_map_flash_region(const char *descr, uintptr_t phys_addr, size_t len) { - void *ret = programmer_table[programmer].map_flash_region(descr, phys_addr, len); + void *ret = programmer_table[programmer]->map_flash_region(descr, phys_addr, len); msg_gspew("%s: mapping %s from 0x%0*" PRIxPTR " to 0x%0*" PRIxPTR "\n", __func__, descr, PRIxPTR_WIDTH, phys_addr, PRIxPTR_WIDTH, (uintptr_t) ret); return ret; @@ -208,7 +208,7 @@ void programmer_unmap_flash_region(void *virt_addr, size_t len) { - programmer_table[programmer].unmap_flash_region(virt_addr, len); + programmer_table[programmer]->unmap_flash_region(virt_addr, len); msg_gspew("%s: unmapped 0x%0*" PRIxPTR "\n", __func__, PRIxPTR_WIDTH, (uintptr_t)virt_addr); } @@ -256,7 +256,7 @@ void programmer_delay(unsigned int usecs) { if (usecs > 0) - programmer_table[programmer].delay(usecs); + programmer_table[programmer]->delay(usecs); } int read_memmapped(struct flashctx *flash, uint8_t *buf, unsigned int start, @@ -840,12 +840,12 @@ flash->chip->vendor, flash->chip->name, flash->chip->total_size, tmp); free(tmp); #if CONFIG_INTERNAL == 1 - if (programmer_table[programmer].map_flash_region == physmap) + if (programmer_table[programmer]->map_flash_region == physmap) msg_cinfo("mapped at physical address 0x%0*" PRIxPTR ".\n", PRIxPTR_WIDTH, flash->physical_memory); else #endif - msg_cinfo("on %s.\n", programmer_table[programmer].name); + msg_cinfo("on %s.\n", programmer_table[programmer]->name); /* Flash registers may more likely not be mapped if the chip was forced. * Lock info may be stored in registers, so avoid lock info printing. */ @@ -1586,7 +1586,7 @@ int i; for (p = 0; p < PROGRAMMER_INVALID; p++) { - pname = programmer_table[p].name; + pname = programmer_table[p]->name; pnamelen = strlen(pname); if (remaining - pnamelen - 2 < 0) { if (firstline) @@ -1718,45 +1718,45 @@ ret = 1; } for (i = 0; i < PROGRAMMER_INVALID; i++) { - const struct programmer_entry p = programmer_table[i]; - if (p.name == NULL) { + const struct programmer_entry *p = programmer_table[i]; + if (p->name == NULL) { msg_gerr("All programmers need a valid name, but the one with index %d does not!\n", i); ret = 1; /* This might hide other problems with this programmer, but allows for better error * messages below without jumping through hoops. */ continue; } - switch (p.type) { + switch (p->type) { case USB: case PCI: case OTHER: - if (p.devs.note == NULL) { - if (strcmp("internal", p.name) == 0) + if (p->devs.note == NULL) { + if (strcmp("internal", p->name) == 0) break; /* This one has its device list stored separately. */ msg_gerr("Programmer %s has neither a device list nor a textual description!\n", - p.name); + p->name); ret = 1; } break; default: - msg_gerr("Programmer %s does not have a valid type set!\n", p.name); + msg_gerr("Programmer %s does not have a valid type set!\n", p->name); ret = 1; break; } - if (p.init == NULL) { - msg_gerr("Programmer %s does not have a valid init function!\n", p.name); + if (p->init == NULL) { + msg_gerr("Programmer %s does not have a valid init function!\n", p->name); ret = 1; } - if (p.delay == NULL) { - msg_gerr("Programmer %s does not have a valid delay function!\n", p.name); + if (p->delay == NULL) { + msg_gerr("Programmer %s does not have a valid delay function!\n", p->name); ret = 1; } - if (p.map_flash_region == NULL) { - msg_gerr("Programmer %s does not have a valid map_flash_region function!\n", p.name); + if (p->map_flash_region == NULL) { + msg_gerr("Programmer %s does not have a valid map_flash_region function!\n", p->name); ret = 1; } - if (p.unmap_flash_region == NULL) { - msg_gerr("Programmer %s does not have a valid unmap_flash_region function!\n", p.name); + if (p->unmap_flash_region == NULL) { + msg_gerr("Programmer %s does not have a valid unmap_flash_region function!\n", p->name); ret = 1; } } diff --git a/libflashrom.c b/libflashrom.c index 23358c9..09a4e4d 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -124,7 +124,7 @@ if (supported_programmers != NULL) { for (; p < PROGRAMMER_INVALID; ++p) { - supported_programmers[p] = programmer_table[p].name; + supported_programmers[p] = programmer_table[p]->name; } } else { msg_gerr("Memory allocation error!\n"); @@ -279,7 +279,7 @@ unsigned prog; for (prog = 0; prog < PROGRAMMER_INVALID; prog++) { - if (strcmp(prog_name, programmer_table[prog].name) == 0) + if (strcmp(prog_name, programmer_table[prog]->name) == 0) break; } if (prog >= PROGRAMMER_INVALID) { diff --git a/print.c b/print.c index feca45e..fbf4882 100644 --- a/print.c +++ b/print.c @@ -425,10 +425,10 @@ } #endif -static void print_supported_devs(const struct programmer_entry prog, const char *const type) +static void print_supported_devs(const struct programmer_entry *prog, const char *const type) { - const struct dev_entry *const devs = prog.devs.dev; - msg_ginfo("\nSupported %s devices for the %s programmer:\n", type, prog.name); + const struct dev_entry *const devs = prog->devs.dev; + msg_ginfo("\nSupported %s devices for the %s programmer:\n", type, prog->name); unsigned int maxvendorlen = strlen("Vendor") + 1; unsigned int maxdevlen = strlen("Device") + 1; @@ -475,7 +475,7 @@ msg_ginfo("\n"); #if CONFIG_INTERNAL == 1 msg_ginfo("\nSupported devices for the %s programmer:\n\n", - programmer_table[PROGRAMMER_INTERNAL].name); + programmer_table[PROGRAMMER_INTERNAL]->name); print_supported_chipsets(); msg_ginfo("\n"); print_supported_boards_helper(boards_known, "mainboards"); @@ -483,8 +483,8 @@ print_supported_boards_helper(laptops_known, "mobile devices"); #endif for (i = 0; i < PROGRAMMER_INVALID; i++) { - const struct programmer_entry prog = programmer_table[i]; - switch (prog.type) { + const struct programmer_entry *prog = programmer_table[i]; + switch (prog->type) { case USB: print_supported_devs(prog, "USB"); break; @@ -492,14 +492,14 @@ print_supported_devs(prog, "PCI"); break; case OTHER: - if (prog.devs.note != NULL) { - msg_ginfo("\nSupported devices for the %s programmer:\n", prog.name); - msg_ginfo("%s", prog.devs.note); + if (prog->devs.note != NULL) { + msg_ginfo("\nSupported devices for the %s programmer:\n", prog->name); + msg_ginfo("%s", prog->devs.note); } break; default: msg_gerr("\n%s: %s: Uninitialized programmer type! Please report a bug at " - "flashrom(a)flashrom.org\n", __func__, prog.name); + "flashrom(a)flashrom.org\n", __func__, prog->name); break; } } diff --git a/print_wiki.c b/print_wiki.c index b2ac65c..4088d9f 100644 --- a/print_wiki.c +++ b/print_wiki.c @@ -355,11 +355,11 @@ return count; } -static void print_supported_devs_wiki_helper(const struct programmer_entry prog) +static void print_supported_devs_wiki_helper(const struct programmer_entry *prog) { int i = 0; static int c = 0; - const struct dev_entry *devs = prog.devs.dev; + const struct dev_entry *devs = prog->devs.dev; const unsigned int count = count_supported_devs_wiki(devs); /* Alternate colors if the vendor changes. */ @@ -368,7 +368,7 @@ for (i = 0; devs[i].vendor_id != 0; i++) { printf("|- bgcolor=\"#%s\"\n", (c) ? "eeeeee" : "dddddd"); if (i == 0) - printf("| rowspan=\"%u\" | %s |", count, prog.name); + printf("| rowspan=\"%u\" | %s |", count, prog->name); printf("| %s || %s || %04x:%04x || {{%s}}\n", devs[i].vendor_name, devs[i].device_name, devs[i].vendor_id, devs[i].device_id, test_state_to_template(devs[i].status)); } @@ -381,13 +381,13 @@ unsigned int i; for (i = 0; i < PROGRAMMER_INVALID; i++) { - const struct programmer_entry prog = programmer_table[i]; - switch (prog.type) { + const struct programmer_entry *prog = programmer_table[i]; + switch (prog->type) { case USB: - usb_count += count_supported_devs_wiki(prog.devs.dev); + usb_count += count_supported_devs_wiki(prog->devs.dev); break; case PCI: - pci_count += count_supported_devs_wiki(prog.devs.dev); + pci_count += count_supported_devs_wiki(prog->devs.dev); break; case OTHER: default: @@ -400,8 +400,8 @@ "{%s%s", pci_count, th_start, programmer_th); for (i = 0; i < PROGRAMMER_INVALID; i++) { - const struct programmer_entry prog = programmer_table[i]; - if (prog.type == PCI) { + const struct programmer_entry *prog = programmer_table[i]; + if (prog->type == PCI) { print_supported_devs_wiki_helper(prog); } } @@ -412,8 +412,8 @@ "{%s%s", usb_count, th_start, programmer_th); for (i = 0; i < PROGRAMMER_INVALID; i++) { - const struct programmer_entry prog = programmer_table[i]; - if (prog.type == USB) { + const struct programmer_entry *prog = programmer_table[i]; + if (prog->type == USB) { print_supported_devs_wiki_helper(prog); } } @@ -426,11 +426,11 @@ for (i = 0; i < PROGRAMMER_INVALID; i++) { static int c = 0; - const struct programmer_entry prog = programmer_table[i]; - if (prog.type == OTHER && prog.devs.note != NULL) { + const struct programmer_entry *prog = programmer_table[i]; + if (prog->type == OTHER && prog->devs.note != NULL) { c = !c; printf("|- bgcolor=\"#%s\"\n", (c) ? "eeeeee" : "dddddd"); - printf("| %s || %s", prog.name, prog.devs.note); + printf("| %s || %s", prog->name, prog->devs.note); } } printf("\n|}\n\n|}\n"); diff --git a/programmer.h b/programmer.h index 524d360..de03d0e 100644 --- a/programmer.h +++ b/programmer.h @@ -175,7 +175,7 @@ void (*delay) (unsigned int usecs); }; -extern const struct programmer_entry programmer_table[]; +extern const struct programmer_entry *programmer_table[]; extern const size_t programmer_table_size; int programmer_init(enum programmer prog, const char *param); diff --git a/programmer_table.c b/programmer_table.c index ae75bdc..2465d9e 100644 --- a/programmer_table.c +++ b/programmer_table.c @@ -1,482 +1,638 @@ #include "programmer.h" - -const struct programmer_entry programmer_table[] = { #if CONFIG_INTERNAL == 1 - { - .name = "internal", - .type = OTHER, - .devs.note = NULL, - .init = internal_init, - .map_flash_region = physmap, - .unmap_flash_region = physunmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_internal = { + .name = "internal", + .type = OTHER, + .devs.note = NULL, + .init = internal_init, + .map_flash_region = physmap, + .unmap_flash_region = physunmap, + .delay = internal_delay, +}; #endif #if CONFIG_DUMMY == 1 - { - .name = "dummy", - .type = OTHER, - /* FIXME */ - .devs.note = "Dummy device, does nothing and logs all accesses\n", - .init = dummy_init, - .map_flash_region = dummy_map, - .unmap_flash_region = dummy_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_dummy = { + .name = "dummy", + .type = OTHER, + /* FIXME */ + .devs.note = "Dummy device, does nothing and logs all accesses\n", + .init = dummy_init, + .map_flash_region = dummy_map, + .unmap_flash_region = dummy_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_MEC1308 == 1 - { - .name = "mec1308", - .type = OTHER, - .devs.note = "Microchip MEC1308 Embedded Controller.\n", - .init = mec1308_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_mec1308 = { + .name = "mec1308", + .type = OTHER, + .devs.note = "Microchip MEC1308 Embedded Controller.\n", + .init = mec1308_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_NIC3COM == 1 - { - .name = "nic3com", - .type = PCI, - .devs.dev = nics_3com, - .init = nic3com_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_nic3com = { + .name = "nic3com", + .type = PCI, + .devs.dev = nics_3com, + .init = nic3com_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_NICREALTEK == 1 - { - /* This programmer works for Realtek RTL8139 and SMC 1211. */ - .name = "nicrealtek", - .type = PCI, - .devs.dev = nics_realtek, - .init = nicrealtek_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_nicrealtek = { + /* This programmer works for Realtek RTL8139 and SMC 1211. */ + .name = "nicrealtek", + .type = PCI, + .devs.dev = nics_realtek, + .init = nicrealtek_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_NICNATSEMI == 1 - { - .name = "nicnatsemi", - .type = PCI, - .devs.dev = nics_natsemi, - .init = nicnatsemi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_nicnatsemi = { + .name = "nicnatsemi", + .type = PCI, + .devs.dev = nics_natsemi, + .init = nicnatsemi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_GFXNVIDIA == 1 - { - .name = "gfxnvidia", - .type = PCI, - .devs.dev = gfx_nvidia, - .init = gfxnvidia_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_gfxnvidia = { + .name = "gfxnvidia", + .type = PCI, + .devs.dev = gfx_nvidia, + .init = gfxnvidia_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_RAIDEN_DEBUG_SPI == 1 - { - .name = "raiden_debug_spi", - .type = USB, - .devs.dev = devs_raiden, - .init = raiden_debug_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_raiden_debug_spi = { + .name = "raiden_debug_spi", + .type = USB, + .devs.dev = devs_raiden, + .init = raiden_debug_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_DRKAISER == 1 - { - .name = "drkaiser", - .type = PCI, - .devs.dev = drkaiser_pcidev, - .init = drkaiser_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_drkaiser = { + .name = "drkaiser", + .type = PCI, + .devs.dev = drkaiser_pcidev, + .init = drkaiser_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_SATASII == 1 - { - .name = "satasii", - .type = PCI, - .devs.dev = satas_sii, - .init = satasii_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_satasii = { + .name = "satasii", + .type = PCI, + .devs.dev = satas_sii, + .init = satasii_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_ATAHPT == 1 - { - .name = "atahpt", - .type = PCI, - .devs.dev = ata_hpt, - .init = atahpt_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_atahpt = { + .name = "atahpt", + .type = PCI, + .devs.dev = ata_hpt, + .init = atahpt_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_ATAVIA == 1 - { - .name = "atavia", - .type = PCI, - .devs.dev = ata_via, - .init = atavia_init, - .map_flash_region = atavia_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_atavia = { + .name = "atavia", + .type = PCI, + .devs.dev = ata_via, + .init = atavia_init, + .map_flash_region = atavia_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_ATAPROMISE == 1 - { - .name = "atapromise", - .type = PCI, - .devs.dev = ata_promise, - .init = atapromise_init, - .map_flash_region = atapromise_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_atapromise = { + .name = "atapromise", + .type = PCI, + .devs.dev = ata_promise, + .init = atapromise_init, + .map_flash_region = atapromise_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_IT8212 == 1 - { - .name = "it8212", - .type = PCI, - .devs.dev = devs_it8212, - .init = it8212_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_it8212 = { + .name = "it8212", + .type = PCI, + .devs.dev = devs_it8212, + .init = it8212_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_FT2232_SPI == 1 - { - .name = "ft2232_spi", - .type = USB, - .devs.dev = devs_ft2232spi, - .init = ft2232_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_ft2232_spi = { + .name = "ft2232_spi", + .type = USB, + .devs.dev = devs_ft2232spi, + .init = ft2232_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_SERPROG == 1 - { - .name = "serprog", - .type = OTHER, - /* FIXME */ - .devs.note = "All programmer devices speaking the serprog protocol\n", - .init = serprog_init, - .map_flash_region = serprog_map, - .unmap_flash_region = fallback_unmap, - .delay = serprog_delay, - }, +const struct programmer_entry programmer_serprog = { + .name = "serprog", + .type = OTHER, + /* FIXME */ + .devs.note = "All programmer devices speaking the serprog protocol\n", + .init = serprog_init, + .map_flash_region = serprog_map, + .unmap_flash_region = fallback_unmap, + .delay = serprog_delay, +}; #endif #if CONFIG_BUSPIRATE_SPI == 1 - { - .name = "buspirate_spi", - .type = OTHER, - /* FIXME */ - .devs.note = "Dangerous Prototypes Bus Pirate\n", - .init = buspirate_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_buspirate_spi = { + .name = "buspirate_spi", + .type = OTHER, + /* FIXME */ + .devs.note = "Dangerous Prototypes Bus Pirate\n", + .init = buspirate_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_DEDIPROG == 1 - { - .name = "dediprog", - .type = USB, - .devs.dev = devs_dediprog, - .init = dediprog_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_dediprog = { + .name = "dediprog", + .type = USB, + .devs.dev = devs_dediprog, + .init = dediprog_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_DEVELOPERBOX_SPI == 1 - { - .name = "developerbox", - .type = USB, - .devs.dev = devs_developerbox_spi, - .init = developerbox_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_developerbox = { + .name = "developerbox", + .type = USB, + .devs.dev = devs_developerbox_spi, + .init = developerbox_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_ENE_LPC == 1 - { - .name = "ene_lpc", - .type = OTHER, - .devs.note = "ENE LPC interface keyboard controller\n", - .init = ene_lpc_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_ene_lpc = { + .name = "ene_lpc", + .type = OTHER, + .devs.note = "ENE LPC interface keyboard controller\n", + .init = ene_lpc_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_RAYER_SPI == 1 - { - .name = "rayer_spi", - .type = OTHER, - /* FIXME */ - .devs.note = "RayeR parallel port programmer\n", - .init = rayer_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_rayer_spi = { + .name = "rayer_spi", + .type = OTHER, + /* FIXME */ + .devs.note = "RayeR parallel port programmer\n", + .init = rayer_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_PONY_SPI == 1 - { - .name = "pony_spi", - .type = OTHER, - /* FIXME */ - .devs.note = "Programmers compatible with SI-Prog, serbang or AJAWe\n", - .init = pony_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_pony_spi = { + .name = "pony_spi", + .type = OTHER, + /* FIXME */ + .devs.note = "Programmers compatible with SI-Prog, serbang or AJAWe\n", + .init = pony_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_NICINTEL == 1 - { - .name = "nicintel", - .type = PCI, - .devs.dev = nics_intel, - .init = nicintel_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_nicintel = { + .name = "nicintel", + .type = PCI, + .devs.dev = nics_intel, + .init = nicintel_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_NICINTEL_SPI == 1 - { - .name = "nicintel_spi", - .type = PCI, - .devs.dev = nics_intel_spi, - .init = nicintel_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_nicintel_spi = { + .name = "nicintel_spi", + .type = PCI, + .devs.dev = nics_intel_spi, + .init = nicintel_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_NICINTEL_EEPROM == 1 - { - .name = "nicintel_eeprom", - .type = PCI, - .devs.dev = nics_intel_ee, - .init = nicintel_ee_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_nicintel_eeprom = { + .name = "nicintel_eeprom", + .type = PCI, + .devs.dev = nics_intel_ee, + .init = nicintel_ee_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_OGP_SPI == 1 - { - .name = "ogp_spi", - .type = PCI, - .devs.dev = ogp_spi, - .init = ogp_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_ogp_spi = { + .name = "ogp_spi", + .type = PCI, + .devs.dev = ogp_spi, + .init = ogp_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_SATAMV == 1 - { - .name = "satamv", - .type = PCI, - .devs.dev = satas_mv, - .init = satamv_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_satamv = { + .name = "satamv", + .type = PCI, + .devs.dev = satas_mv, + .init = satamv_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_LINUX_MTD == 1 - { - .name = "linux_mtd", - .type = OTHER, - .devs.note = "Device files /dev/mtd*\n", - .init = linux_mtd_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_linux_mtd = { + .name = "linux_mtd", + .type = OTHER, + .devs.note = "Device files /dev/mtd*\n", + .init = linux_mtd_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_LINUX_SPI == 1 - { - .name = "linux_spi", - .type = OTHER, - .devs.note = "Device files /dev/spidev*.*\n", - .init = linux_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_linux_spi = { + .name = "linux_spi", + .type = OTHER, + .devs.note = "Device files /dev/spidev*.*\n", + .init = linux_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_LSPCON_I2C_SPI == 1 - { - .name = "lspcon_i2c_spi", - .type = OTHER, - .devs.note = "Device files /dev/i2c-*.\n", - .init = lspcon_i2c_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_lspcon_i2c_spi = { + .name = "lspcon_i2c_spi", + .type = OTHER, + .devs.note = "Device files /dev/i2c-*.\n", + .init = lspcon_i2c_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_REALTEK_MST_I2C_SPI == 1 - { - .name = "realtek_mst_i2c_spi", - .type = OTHER, - .devs.note = "Device files /dev/i2c-*.\n", - .init = realtek_mst_i2c_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_realtek_mst_i2c_spi = { + .name = "realtek_mst_i2c_spi", + .type = OTHER, + .devs.note = "Device files /dev/i2c-*.\n", + .init = realtek_mst_i2c_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_USBBLASTER_SPI == 1 - { - .name = "usbblaster_spi", - .type = USB, - .devs.dev = devs_usbblasterspi, - .init = usbblaster_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_usbblaster_spi = { + .name = "usbblaster_spi", + .type = USB, + .devs.dev = devs_usbblasterspi, + .init = usbblaster_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_MSTARDDC_SPI == 1 - { - .name = "mstarddc_spi", - .type = OTHER, - .devs.note = "MSTAR DDC devices addressable via /dev/i2c-* on Linux.\n", - .init = mstarddc_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_mstarddc_spi = { + .name = "mstarddc_spi", + .type = OTHER, + .devs.note = "MSTAR DDC devices addressable via /dev/i2c-* on Linux.\n", + .init = mstarddc_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_PICKIT2_SPI == 1 - { - .name = "pickit2_spi", - .type = USB, - .devs.dev = devs_pickit2_spi, - .init = pickit2_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_pickit2_spi = { + .name = "pickit2_spi", + .type = USB, + .devs.dev = devs_pickit2_spi, + .init = pickit2_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_CH341A_SPI == 1 - { - .name = "ch341a_spi", - .type = USB, - .devs.dev = devs_ch341a_spi, - .init = ch341a_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = ch341a_spi_delay, - }, +const struct programmer_entry programmer_ch341a_spi = { + .name = "ch341a_spi", + .type = USB, + .devs.dev = devs_ch341a_spi, + .init = ch341a_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = ch341a_spi_delay, +}; #endif #if CONFIG_DIGILENT_SPI == 1 - { - .name = "digilent_spi", - .type = USB, - .devs.dev = devs_digilent_spi, - .init = digilent_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_digilent_spi = { + .name = "digilent_spi", + .type = USB, + .devs.dev = devs_digilent_spi, + .init = digilent_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_JLINK_SPI == 1 - { - .name = "jlink_spi", - .type = OTHER, - .init = jlink_spi_init, - .devs.note = "SEGGER J-Link and compatible devices\n", - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_jlink_spi = { + .name = "jlink_spi", + .type = OTHER, + .init = jlink_spi_init, + .devs.note = "SEGGER J-Link and compatible devices\n", + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_NI845X_SPI == 1 - { - .name = "ni845x_spi", - .type = OTHER, // choose other because NI-845x uses own USB implementation - .devs.note = "National Instruments USB-845x\n", - .init = ni845x_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_ni845x_spi = { + .name = "ni845x_spi", + .type = OTHER, // choose other because NI-845x uses own USB implementation + .devs.note = "National Instruments USB-845x\n", + .init = ni845x_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_STLINKV3_SPI == 1 - { - .name = "stlinkv3_spi", - .type = USB, - .devs.dev = devs_stlinkv3_spi, - .init = stlinkv3_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_stlinkv3_spi = { + .name = "stlinkv3_spi", + .type = USB, + .devs.dev = devs_stlinkv3_spi, + .init = stlinkv3_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif - {0}, /* This entry corresponds to PROGRAMMER_INVALID. */ +const struct programmer_entry *programmer_table[] = { + +#if CONFIG_INTERNAL == 1 + &programmer_internal, +#endif + +#if CONFIG_DUMMY == 1 + &programmer_dummy, +#endif + +#if CONFIG_MEC1308 == 1 + &programmer_mec1308, +#endif + +#if CONFIG_NIC3COM == 1 + &programmer_nic3com, +#endif + +#if CONFIG_NICREALTEK == 1 + & programmer_nicrealtek, +#endif + +#if CONFIG_NICNATSEMI == 1 + &programmer_nicnatsemi, +#endif + +#if CONFIG_GFXNVIDIA == 1 + &programmer_gfxnvidia, +#endif + +#if CONFIG_RAIDEN_DEBUG_SPI == 1 + &programmer_raiden_debug_spi, +#endif + +#if CONFIG_DRKAISER == 1 + &programmer_drkaiser, +#endif + +#if CONFIG_SATASII == 1 + &programmer_satasii, +#endif + +#if CONFIG_ATAHPT == 1 + &programmer_atahpt, +#endif + +#if CONFIG_ATAVIA == 1 + &programmer_atavia, +#endif + +#if CONFIG_ATAPROMISE == 1 + &programmer_atapromise, +#endif + +#if CONFIG_IT8212 == 1 + &programmer_it8212, +#endif + +#if CONFIG_FT2232_SPI == 1 + &programmer_ft2232_spi, +#endif + +#if CONFIG_SERPROG == 1 + &programmer_serprog, +#endif + +#if CONFIG_BUSPIRATE_SPI == 1 + &programmer_buspirate_spi, +#endif + +#if CONFIG_DEDIPROG == 1 + &programmer_dediprog, +#endif + +#if CONFIG_DEVELOPERBOX_SPI == 1 + &programmer_developerbox, +#endif + +#if CONFIG_ENE_LPC == 1 + &programmer_ene_lpc, +#endif + +#if CONFIG_RAYER_SPI == 1 + &programmer_rayer_spi, +#endif + +#if CONFIG_PONY_SPI == 1 + &programmer_pony_spi, +#endif + +#if CONFIG_NICINTEL == 1 + &programmer_nicintel, +#endif + +#if CONFIG_NICINTEL_SPI == 1 + &programmer_nicintel_spi, +#endif + +#if CONFIG_NICINTEL_EEPROM == 1 + &programmer_nicintel_eeprom, +#endif + +#if CONFIG_OGP_SPI == 1 + &programmer_ogp_spi, +#endif + +#if CONFIG_SATAMV == 1 + &programmer_satamv, +#endif + +#if CONFIG_LINUX_MTD == 1 + &programmer_linux_mtd, +#endif + +#if CONFIG_LINUX_SPI == 1 + &programmer_linux_spi, +#endif + +#if CONFIG_LSPCON_I2C_SPI == 1 + &programmer_lspcon_i2c_spi, +#endif + +#if CONFIG_REALTEK_MST_I2C_SPI == 1 + &programmer_realtek_mst_i2c_spi, +#endif + +#if CONFIG_USBBLASTER_SPI == 1 + &programmer_usbblaster_spi, +#endif + +#if CONFIG_MSTARDDC_SPI == 1 + &programmer_mstarddc_spi, +#endif + +#if CONFIG_PICKIT2_SPI == 1 + &programmer_pickit2_spi, +#endif + +#if CONFIG_CH341A_SPI == 1 + &programmer_ch341a_spi, +#endif + +#if CONFIG_DIGILENT_SPI == 1 + &programmer_digilent_spi, +#endif + +#if CONFIG_JLINK_SPI == 1 + &programmer_jlink_spi, +#endif + +#if CONFIG_NI845X_SPI == 1 + &programmer_ni845x_spi, +#endif + +#if CONFIG_STLINKV3_SPI == 1 + &programmer_stlinkv3_spi, +#endif + +NULL }; -const size_t programmer_table_size = ARRAY_SIZE(programmer_table); \ No newline at end of file +const size_t programmer_table_size = ARRAY_SIZE(programmer_table); -- To view, visit https://review.coreboot.org/c/flashrom/+/52945 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ifbb0ee4db5a85b1cd2afeafe4dca838579f79878 Gerrit-Change-Number: 52945 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: [WIP] replace programmer enum with a pointer to programmer_entry
by Thomas Heijligen (Code Review) 05 May '21

05 May '21

Attention is currently required from: Thomas Heijligen. Hello Nico Huber, Angel Pons, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/51925 to look at the new patch set (#5). Change subject: [WIP] replace programmer enum with a pointer to programmer_entry ...................................................................... [WIP] replace programmer enum with a pointer to programmer_entry enum programmer was used as index to select a programmer_entry. By replacing it with a direct pointer to an entry in the programmer_table we removed the problem ob syncing the enum with the table. [FOLLOW UP] Abstract the available programmer enumeration. Move the struct programmer_enty to the programmers source Change-Id: I7435ee2bb661e4f139034bb289b84ebd41e1e9e9 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> --- M cli_classic.c M flashrom.c M libflashrom.c M print.c M print_wiki.c M programmer.h M tests/init_shutdown.c 7 files changed, 52 insertions(+), 179 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/25/51925/5 -- To view, visit https://review.coreboot.org/c/flashrom/+/51925 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7435ee2bb661e4f139034bb289b84ebd41e1e9e9 Gerrit-Change-Number: 51925 Gerrit-PatchSet: 5 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Xiang Wang <wxjstz(a)126.com> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: libflashrom: Return progress state to the library user
by Richard Hughes (Code Review) 05 May '21

05 May '21

Attention is currently required from: Richard Hughes, Angel Pons, Patrick Rudolph. Hello build bot (Jenkins), Edward O'Callaghan, Daniel Campello, Angel Pons, Anastasia Klimchuk, Patrick Rudolph, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/49643 to look at the new patch set (#7). Change subject: libflashrom: Return progress state to the library user ...................................................................... libflashrom: Return progress state to the library user Projects using libflashrom like fwupd expect the user to wait for the operation to complete. To avoid the user thinking the process has "hung" or "got stuck" report back the progress complete of the erase, write and read operations. Include a test for the dummy spi25 device. Change-Id: I7197572bb7f19e3bdb2bde855d70a0f50fd3854c Signed-off-by: Richard Hughes <richard(a)hughsie.com> --- M 82802ab.c M at45db.c M cli_classic.c M cli_output.c M dediprog.c M en29lv640b.c M flash.h M it87spi.c M jedec.c M libflashrom.c M libflashrom.h M linux_mtd.c M lspcon_i2c_spi.c M realtek_mst_i2c_spi.c M spi.c M spi25.c M sst28sf040.c M tests/spi25.c M tests/tests.c M tests/tests.h 20 files changed, 145 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/43/49643/7 -- To view, visit https://review.coreboot.org/c/flashrom/+/49643 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7197572bb7f19e3bdb2bde855d70a0f50fd3854c Gerrit-Change-Number: 49643 Gerrit-PatchSet: 7 Gerrit-Owner: Richard Hughes <richard(a)hughsie.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-CC: Richard Hughes <hughsient(a)gmail.com> Gerrit-CC: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Richard Hughes <richard(a)hughsie.com> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Patrick Rudolph <siro(a)das-labor.org> Gerrit-MessageType: newpatchset

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit May 2021