[flashrom-gerrit] Change in flashrom[master]: ft2232_spi.c: align with Chrome OS flashrom

[Nikolai Artemiev (Code Review)]

Nikolai Artemiev has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/42796 )

Change subject: ft2232_spi.c: align with Chrome OS flashrom
......................................................................

ft2232_spi.c: align with Chrome OS flashrom

Brings over various changes:
- Limit servo channel selection to valid range
- Use DIS_DIV_5 constant
- Update some comments
- Wrap long lines

Signed-off-by: Nikolai Artemiev 
Change-Id: I24c20e9b5d7e661d0180699bbd0d1447f6bf816f
---
M ft2232_spi.c
1 file changed, 20 insertions(+), 10 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/96/42796/1

diff --git a/ft2232_spi.c b/ft2232_spi.c
index 87e6057..083e58f 100644
--- a/ft2232_spi.c
+++ b/ft2232_spi.c
@@ -110,7 +110,8 @@
 {
    int i;
    for (i = 0; devs_ft2232spi[i].vendor_name != NULL; i++) {
-		if ((devs_ft2232spi[i].device_id == ft2232_type) && (devs_ft2232spi[i].vendor_id == ft2232_vid))
+		if ((devs_ft2232spi[i].device_id == ft2232_type)
+			&& (devs_ft2232spi[i].vendor_id == ft2232_vid))
    			return devs_ft2232spi[i].device_name;
    }
    return "unknown device";
@@ -120,7 +121,8 @@
 {
    int i;
    for (i = 0; devs_ft2232spi[i].vendor_name != NULL; i++) {
-		if ((devs_ft2232spi[i].device_id == ft2232_type) && (devs_ft2232spi[i].vendor_id == ft2232_vid))
+		if ((devs_ft2232spi[i].device_id == ft2232_type)
+			&& (devs_ft2232spi[i].vendor_id == ft2232_vid))
    			return devs_ft2232spi[i].vendor_name;
    }
    return "unknown vendor";
@@ -132,7 +134,8 @@
    int r;
    r = ftdi_write_data(ftdic, (unsigned char *) buf, size);
    if (r < 0) {
-		msg_perr("ftdi_write_data: %d, %s\n", r, ftdi_get_error_string(ftdic));
+		msg_perr("ftdi_write_data: %d, %s\n", r,
+				ftdi_get_error_string(ftdic));
    	return 1;
    }
    return 0;
@@ -146,7 +149,8 @@
    while (size > 0) {
    	r = ftdi_read_data(ftdic, (unsigned char *) buf, size);
    	if (r < 0) {
-			msg_perr("ftdi_read_data: %d, %s\n", r, ftdi_get_error_string(ftdic));
+			msg_perr("ftdi_read_data: %d, %s\n", r,
+					ftdi_get_error_string(ftdic));
    		return 1;
    	}
    	buf += r;
@@ -183,8 +187,8 @@
    enum ftdi_interface ft2232_interface = INTERFACE_A;
    /*
     * The 'H' chips can run with an internal clock of either 12 MHz or 60 MHz,
-	 * but the non-H chips can only run at 12 MHz. We enable the divide-by-5
-	 * prescaler on the former to run on the same speed.
+	 * but the non-H chips can only run at 12 MHz. We disable the divide-by-5
+	 * prescaler on 'H' chips so they run at 60MHz.
     */
    uint8_t clock_5x = 1;
    /* In addition to the prescaler mentioned above there is also another
@@ -193,7 +197,8 @@
     * div = (1 + x) * 2 <-> x = div / 2 - 1
     * Hence the expressible divisors are all even numbers between 2 and
     * 2^17 (=131072) resulting in SCK frequencies of 6 MHz down to about
-	 * 92 Hz for 12 MHz inputs.
+	 * 92 Hz for 12 MHz inputs and 30 MHz down to about 458 Hz for 60 MHz
+	 * inputs.
     */
    uint32_t divisor = DEFAULT_DIVISOR;
    int f;
@@ -268,14 +273,17 @@
    	} else if (!strcasecmp(arg, "google-servo")) {
    		ft2232_vid = GOOGLE_VID;
    		ft2232_type = GOOGLE_SERVO_PID;
+			channel_count = 2;
    	} else if (!strcasecmp(arg, "google-servo-v2")) {
    		ft2232_vid = GOOGLE_VID;
    		ft2232_type = GOOGLE_SERVO_V2_PID1;
+			channel_count = 2;
    		/* Default divisor is too fast, and chip ID fails */
    		divisor = 6;
    	} else if (!strcasecmp(arg, "google-servo-v2-legacy")) {
    		ft2232_vid = GOOGLE_VID;
    		ft2232_type = GOOGLE_SERVO_V2_PID0;
+			channel_count = 2;
    	} else if (!strcasecmp(arg, "flyswatter")) {
    		ft2232_type = FTDI_FT2232H_PID;
    		channel_count = 2;
@@ -381,7 +389,8 @@
    free(arg);

if (f < 0 && f != -5) {
-		msg_perr("Unable to open FTDI device: %d (%s).\n", f, ftdi_get_error_string(ftdic));
+		msg_perr("Unable to open FTDI device: %d (%s)\n", f,
+				ftdi_get_error_string(ftdic));
    	return -4;
    }

@@ -408,7 +417,7 @@

if (clock_5x) {
    	msg_pdbg("Disable divide-by-5 front stage\n");
-		buf[0] = 0x8a; /* Disable divide-by-5. DIS_DIV_5 in newer libftdi */
+		buf[0] = DIS_DIV_5;
    	if (send_buf(ftdic, buf, 1)) {
    		ret = -5;
    		goto ftdi_err;
@@ -453,7 +462,8 @@

ftdi_err:
    if ((f = ftdi_usb_close(ftdic)) < 0) {
-		msg_perr("Unable to close FTDI device: %d (%s)\n", f, ftdi_get_error_string(ftdic));
+		msg_perr("Unable to close FTDI device: %d (%s)\n", f,
+		         ftdi_get_error_string(ftdic));
    }
    return ret;
 }