diff options
| author | Uwe Hermann <uwe@hermann-uwe.de> | 2010-03-13 17:28:29 +0000 |
|---|---|---|
| committer | Uwe Hermann <uwe@hermann-uwe.de> | 2010-03-13 17:28:29 +0000 |
| commit | 439597032eae0f41745d9173805945c5c85475eb (patch) | |
| tree | 76c0a1816f51012775006aa8c82bdfe78901b5ab /serial.c | |
| parent | 645c6df21a9570da7f8ac07fe740a0df3a1d4d1c (diff) | |
| download | ast2050-flashrom-439597032eae0f41745d9173805945c5c85475eb.zip ast2050-flashrom-439597032eae0f41745d9173805945c5c85475eb.tar.gz | |
Various coding style and cosmetic changes
- Fix coding-style, whitespace, and indentation in a few places.
- Consistently use the same spelling ("Super I/O") everywhere.
Corresponding to flashrom svn r933.
- Make some flashrom stdout output look a bit nicer.
Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
Diffstat (limited to 'serial.c')
| -rw-r--r-- | serial.c | 23 |
1 files changed, 12 insertions, 11 deletions
@@ -105,13 +105,15 @@ fdtype sp_openserport(char *dev, unsigned int baud) { #ifdef _WIN32 HANDLE fd; - char* dev2 = dev; - if ((strlen(dev) > 3) && (tolower(dev[0])=='c') && (tolower(dev[1])=='o') && (tolower(dev[2])=='m')) { - dev2 = malloc(strlen(dev)+5); + char *dev2 = dev; + if ((strlen(dev) > 3) && (tolower(dev[0]) == 'c') + && (tolower(dev[1]) == 'o') && (tolower(dev[2]) == 'm')) { + dev2 = malloc(strlen(dev) + 5); strcpy(dev2, "\\\\.\\"); - strcpy(dev2+4, dev); + strcpy(dev2 + 4, dev); } - fd = CreateFile(dev2, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + fd = CreateFile(dev2, GENERIC_READ | GENERIC_WRITE, 0, NULL, + OPEN_EXISTING, 0, NULL); if (dev2 != dev) free(dev2); if (fd == INVALID_HANDLE_VALUE) { @@ -129,9 +131,9 @@ fdtype sp_openserport(char *dev, unsigned int baud) case 115200: dcb.BaudRate = CBR_115200; break; default: sp_die("Error: Could not set baud rate"); } - dcb.ByteSize=8; - dcb.Parity=NOPARITY; - dcb.StopBits=ONESTOPBIT; + dcb.ByteSize = 8; + dcb.Parity = NOPARITY; + dcb.StopBits = ONESTOPBIT; if (!SetCommState(fd, &dcb)) { sp_die("Error: Could not change serial port configuration"); } @@ -147,9 +149,8 @@ fdtype sp_openserport(char *dev, unsigned int baud) for (i = 0;; i++) { if (sp_baudtable[i].baud == 0) { close(fd); - msg_perr( - "Error: cannot configure for baudrate %d\n", - baud); + msg_perr("Error: cannot configure for baudrate %d\n", + baud); exit(1); } if (sp_baudtable[i].baud == baud) { |
