Change in em100[master]: Fix serial number printing and parsing

[Stefan Reinauer (Code Review)]

Stefan Reinauer has uploaded this change for review. ( https://review.coreboot.org/c/em100/+/37083 )

Change subject: Fix serial number printing and parsing
......................................................................

Fix serial number printing and parsing

Dediprog has switched the format of serial numbers on newer
EM100Pro and all EM100Pro-G2 from DPxxxxxx to EMxxxxxx. Switch
to that format, but still allow the format DPxxxxxx when a serial
number is entered.

Signed-off-by: Stefan Reinauer 
Change-Id: Idf44d1a468a7c62b0c5d2d66c37f261eb3c1950c
---
M em100.c
1 file changed, 9 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/em100 refs/changes/83/37083/1

diff --git a/em100.c b/em100.c
index 4950fa8..5949ec8 100644
--- a/em100.c
+++ b/em100.c
@@ -255,7 +255,7 @@
    /* Re-read serial number */
    get_device_info(em100);
    if (em100->serialno != 0xffffffff)
-		printf("New serial number: DP%06d\n", em100->serialno);
+		printf("New serial number: EM%06d\n", em100->serialno);
    else
    	printf("New serial number: N.A.\n");

@@ -433,7 +433,7 @@
    	if (bus && device)
    		printf("Could not find EM100pro at %03d:%03d.\n", bus, device);
    	else if (serial_number)
-			printf("Could not find EM100pro with serial number DP%06d.\n",
+			printf("Could not find EM100pro with serial number EM%06d.\n",
    				serial_number);
    	else
    		printf("Could not find EM100pro device.\n");
@@ -493,7 +493,7 @@
    				libusb_get_device_address(dev));
    		continue;
    	}
-		printf(" Bus %03d Device %03d: EM100pro DP%06d\n",
+		printf(" Bus %03d Device %03d: EM100pro EM%06d\n",
    			libusb_get_bus_number(dev),
    			libusb_get_device_address(dev),
    			em100.serialno);
@@ -679,7 +679,7 @@
    	"  -V|--set-voltage [1.8|3.3]      switch FPGA voltage\n"
    	"  -p|--holdpin [LOW|FLOAT|INPUT]: set the hold pin state\n"
    	"  -x|--device BUS:DEV             use EM100pro on USB bus/device\n"
-		"  -x|--device DPxxxxxx            use EM100pro with serial no DPxxxxxx\n"
+		"  -x|--device EMxxxxxx            use EM100pro with serial no EMxxxxxx\n"
    	"  -l|--list-devices               list all connected EM100pro devices\n"
    	"  -D|--debug:                     print debug information.\n"
    	"  -h|--help:                      this help text\n\n",
@@ -830,7 +830,7 @@
    printf("Hardware version: %u\n", em100.hwversion);

if (em100.serialno != 0xffffffff)
-		printf("Serial number: DP%06d\n", em100.serialno);
+		printf("Serial number: EM%06d\n", em100.serialno);
    else
    	printf("Serial number: N.A.\n");
    printf("SPI flash database: %s\n", VERSION);
@@ -858,6 +858,10 @@
    	if ((serialno[0] == 'D' || serialno[0] == 'd') &&
    	    (serialno[1] == 'P' || serialno[1] == 'p'))
    		offset = 2;
+		/* if the user specified a serial containing EM, skip that */
+		if ((serialno[0] == 'E' || serialno[0] == 'e') &&
+		    (serialno[1] == 'M' || serialno[1] == 'm'))
+			offset = 2;

if (sscanf(serialno + offset, "%d", &serial_number) != 1)
    		printf("Error: Can't parse serial number '%s'\n",

[Stefan Reinauer (Code Review)]

Hello Furquan Shaikh, build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/em100/+/37083

to look at the new patch set (#3).

Change subject: Fix serial number printing and parsing
......................................................................

Fix serial number printing and parsing

Dediprog has switched the format of serial numbers on newer
EM100Pro and all EM100Pro-G2 from DPxxxxxx to EMxxxxxx. Switch
to that format, but still allow the format DPxxxxxx when a serial
number is entered.

Signed-off-by: Stefan Reinauer 
Change-Id: Idf44d1a468a7c62b0c5d2d66c37f261eb3c1950c
---
M em100.c
1 file changed, 9 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/em100 refs/changes/83/37083/3

[Martin Roth (Code Review)]

Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/em100/+/37083 )

Change subject: Fix serial number printing and parsing
......................................................................

Patch Set 5: Code-Review+2

[Stefan Reinauer (Code Review)]

Stefan Reinauer has submitted this change. ( https://review.coreboot.org/c/em100/+/37083 )

Change subject: Fix serial number printing and parsing
......................................................................

Fix serial number printing and parsing

Dediprog has switched the format of serial numbers on newer
EM100Pro and all EM100Pro-G2 from DPxxxxxx to EMxxxxxx. Switch
to that format, but still allow the format DPxxxxxx when a serial
number is entered.

Signed-off-by: Stefan Reinauer 
Change-Id: Idf44d1a468a7c62b0c5d2d66c37f261eb3c1950c
Reviewed-on: https://review.coreboot.org/c/em100/+/37083
Tested-by: build bot (Jenkins) 
Reviewed-by: Martin Roth 
---
M em100.c
1 file changed, 9 insertions(+), 5 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Martin Roth: Looks good to me, approved

diff --git a/em100.c b/em100.c
index 9570e25..10649bf 100644
--- a/em100.c
+++ b/em100.c
@@ -255,7 +255,7 @@
    /* Re-read serial number */
    get_device_info(em100);
    if (em100->serialno != 0xffffffff)
-		printf("New serial number: DP%06d\n", em100->serialno);
+		printf("New serial number: EM%06d\n", em100->serialno);
    else
    	printf("New serial number: N.A.\n");

@@ -433,7 +433,7 @@
    	if (bus && device)
    		printf("Could not find EM100pro at %03d:%03d.\n", bus, device);
    	else if (serial_number)
-			printf("Could not find EM100pro with serial number DP%06d.\n",
+			printf("Could not find EM100pro with serial number EM%06d.\n",
    				serial_number);
    	else
    		printf("Could not find EM100pro device.\n");
@@ -493,7 +493,7 @@
    				libusb_get_device_address(dev));
    		continue;
    	}
-		printf(" Bus %03d Device %03d: EM100pro DP%06d\n",
+		printf(" Bus %03d Device %03d: EM100pro EM%06d\n",
    			libusb_get_bus_number(dev),
    			libusb_get_device_address(dev),
    			em100.serialno);
@@ -679,7 +679,7 @@
    	"  -V|--set-voltage [1.8|3.3]      switch FPGA voltage\n"
    	"  -p|--holdpin [LOW|FLOAT|INPUT]: set the hold pin state\n"
    	"  -x|--device BUS:DEV             use EM100pro on USB bus/device\n"
-		"  -x|--device DPxxxxxx            use EM100pro with serial no DPxxxxxx\n"
+		"  -x|--device EMxxxxxx            use EM100pro with serial no EMxxxxxx\n"
    	"  -l|--list-devices               list all connected EM100pro devices\n"
    	"  -D|--debug:                     print debug information.\n"
    	"  -h|--help:                      this help text\n\n",
@@ -830,7 +830,7 @@
    printf("Hardware version: %u\n", em100.hwversion);

if (em100.serialno != 0xffffffff)
-		printf("Serial number: DP%06d\n", em100.serialno);
+		printf("Serial number: EM%06d\n", em100.serialno);
    else
    	printf("Serial number: N.A.\n");
    printf("SPI flash database: %s\n", VERSION);
@@ -858,6 +858,10 @@
    	if ((serialno[0] == 'D' || serialno[0] == 'd') &&
    	    (serialno[1] == 'P' || serialno[1] == 'p'))
    		offset = 2;
+		/* if the user specified a serial containing EM, skip that */
+		if ((serialno[0] == 'E' || serialno[0] == 'e') &&
+		    (serialno[1] == 'M' || serialno[1] == 'm'))
+			offset = 2;

if (sscanf(serialno + offset, "%d", &serial_number) != 1)
    		printf("Error: Can't parse serial number '%s'\n",