flashrom

flashrom@flashrom.org

8 participants
9164 discussions

[commit] r1661 - trunk
by repository service 31 Mar '13

31 Mar '13

Author: stefanct Date: Mon Apr 1 02:45:38 2013 New Revision: 1661 URL: http://flashrom.org/trac/flashrom/changeset/1661 Log: Replace sp_sync_read_timeout() with serialport_read_nonblock(). It seems useful to have a generic and platform-independent method to read and write to a serial port without blocking. This is the read part. It stores the current blocking properties before disabling blocking and restores them after reading. The timeout is implemented as previously by retrying every millisecond until the timeout is reached or enough characters are available. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/programmer.h trunk/serial.c trunk/serprog.c Modified: trunk/programmer.h ============================================================================== --- trunk/programmer.h Mon Apr 1 02:45:32 2013 (r1660) +++ trunk/programmer.h Mon Apr 1 02:45:38 2013 (r1661) @@ -661,6 +661,7 @@ int serialport_shutdown(void *data); int serialport_write(unsigned char *buf, unsigned int writecnt); int serialport_read(unsigned char *buf, unsigned int readcnt); +int serialport_read_nonblock(unsigned char *c, unsigned int readcnt, unsigned int timeout, unsigned int *really_read); /* Serial port/pin mapping: Modified: trunk/serial.c ============================================================================== --- trunk/serial.c Mon Apr 1 02:45:32 2013 (r1660) +++ trunk/serial.c Mon Apr 1 02:45:38 2013 (r1661) @@ -361,3 +361,73 @@ return 0; } + +/* Tries up to timeout ms to read readcnt characters and places them into the array starting at c. Returns + * 0 on success, positive values on temporary errors (e.g. timeouts) and negative ones on permanent errors. + * If really_read is not NULL, this function sets its contents to the number of bytes read successfully. */ +int serialport_read_nonblock(unsigned char *c, unsigned int readcnt, unsigned int timeout, unsigned int *really_read) +{ + int ret = 1; + /* disable blocked i/o and declare platform-specific variables */ +#ifdef _WIN32 + DWORD rv; + COMMTIMEOUTS oldTimeout; + COMMTIMEOUTS newTimeout = { + .ReadIntervalTimeout = MAXDWORD, + .ReadTotalTimeoutMultiplier = 0, + .ReadTotalTimeoutConstant = 0, + .WriteTotalTimeoutMultiplier = 0, + .WriteTotalTimeoutConstant = 0 + }; + if(!GetCommTimeouts(sp_fd, &oldTimeout)) { + msg_perr_strerror("Could not get serial port timeout settings: "); + return -1; + } + if(!SetCommTimeouts(sp_fd, &newTimeout)) { +#else + ssize_t rv; + const int flags = fcntl(sp_fd, F_GETFL); + if (fcntl(sp_fd, F_SETFL, flags | O_NONBLOCK) != 0) { +#endif + msg_perr_strerror("Could not set serial port timeout settings %s"); + return -1; + } + + int i; + int rd_bytes = 0; + for (i = 0; i < timeout; i++) { + msg_pspew("readcnt %d rd_bytes %d\n", readcnt, rd_bytes); +#ifdef _WIN32 + ReadFile(sp_fd, c + rd_bytes, readcnt - rd_bytes, &rv, NULL); + msg_pspew("read %lu bytes\n", rv); +#else + rv = read(sp_fd, c + rd_bytes, readcnt - rd_bytes); + msg_pspew("read %zd bytes\n", rv); +#endif + if ((rv == -1) && (errno != EAGAIN)) { + msg_perr_strerror("Serial port read error: "); + ret = -1; + break; + } + if (rv > 0) + rd_bytes += rv; + if (rd_bytes == readcnt) { + ret = 0; + break; + } + internal_delay(1000); /* 1ms units */ + } + if (really_read != NULL) + *really_read = rd_bytes; + + /* restore original blocking behavior */ +#ifdef _WIN32 + if (!SetCommTimeouts(sp_fd, &oldTimeout)) { +#else + if (fcntl(sp_fd, F_SETFL, flags) != 0) { +#endif + msg_perr_strerror("Could not restore serial port timeout settings: %s\n"); + ret = -1; + } + return ret; +} Modified: trunk/serprog.c ============================================================================== --- trunk/serprog.c Mon Apr 1 02:45:32 2013 (r1660) +++ trunk/serprog.c Mon Apr 1 02:45:38 2013 (r1661) @@ -115,26 +115,6 @@ return sock; } -/* Returns 0 on success and places the character read into the location pointed to by c. - * Returns positive values on temporary errors and negative ones on permanent errors. - * An iteration of one loop takes up to 1ms. */ -static int sp_sync_read_timeout(unsigned int loops, unsigned char *c) -{ - int i; - for (i = 0; i < loops; i++) { - ssize_t rv; - rv = read(sp_fd, c, 1); - if (rv == 1) - return 0; - if ((rv == -1) && (errno != EAGAIN)) { - msg_perr("read: %s\n", strerror(errno)); - return -1; - } - usleep(1000); /* 1ms units */ - } - return 1; -} - /* Synchronize: a bit tricky algorithm that tries to (and in my tests has * * always succeeded in) bring the serial protocol to known waiting-for- * * command state - uses nonblocking read - rest of the driver uses * @@ -174,12 +154,12 @@ msg_pdbg("."); fflush(stdout); for (n = 0; n < 10; n++) { - int ret = sp_sync_read_timeout(50, &c); + int ret = serialport_read_nonblock(&c, 1, 50, NULL); if (ret < 0) goto err_out; if (ret > 0 || c != S_NAK) continue; - ret = sp_sync_read_timeout(20, &c); + ret = serialport_read_nonblock(&c, 1, 20, NULL); if (ret < 0) goto err_out; if (ret > 0 || c != S_ACK) @@ -189,12 +169,12 @@ msg_perr("sync write: %s\n", strerror(errno)); return 1; } - ret = sp_sync_read_timeout(500, &c); + ret = serialport_read_nonblock(&c, 1, 500, NULL); if (ret < 0) goto err_out; if (ret > 0 || c != S_NAK) break; /* fail */ - ret = sp_sync_read_timeout(100, &c); + ret = serialport_read_nonblock(&c, 1, 100, NULL); if (ret > 0 || ret < 0) goto err_out; if (c != S_ACK)

1 0

[commit] r1660 - trunk
by repository service 31 Mar '13

31 Mar '13

Author: stefanct Date: Mon Apr 1 02:45:32 2013 New Revision: 1660 URL: http://flashrom.org/trac/flashrom/changeset/1660 Log: serial.c: round baudrates to valid ones. MSDN says: "The baud rate at which the communications device operates. This member can be an actual baud rate value, or one of the following indexes." But it is not specified what happens for different values, so we round down to valid ones (or to the minimum of 9600) by reusing the existing struct baudentry sp_baudtable[] and the new function round_baud(). Do similarly on non-Windows where arbitrary values are not allowed anyway. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/serial.c Modified: trunk/serial.c ============================================================================== --- trunk/serial.c Mon Apr 1 02:45:08 2013 (r1659) +++ trunk/serial.c Mon Apr 1 02:45:32 2013 (r1660) @@ -47,62 +47,95 @@ exit(1); } -#ifndef _WIN32 +#ifdef _WIN32 +struct baudentry { + DWORD flag; + unsigned int baud; +}; +#define BAUDENTRY(baud) { CBR_##baud, baud }, +#else struct baudentry { int flag; unsigned int baud; }; - -/* I'd like if the C preprocessor could have directives in macros */ #define BAUDENTRY(baud) { B##baud, baud }, +#endif + +/* I'd like if the C preprocessor could have directives in macros. + * See TERMIOS(3) and http://msdn.microsoft.com/en-us/library/windows/desktop/aa363214(v=vs.85).a… and + * http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=blob;f=inclu… */ static const struct baudentry sp_baudtable[] = { - BAUDENTRY(9600) + BAUDENTRY(9600) /* unconditional default */ +#if defined(B19200) || defined(CBR_19200) BAUDENTRY(19200) +#endif +#if defined(B38400) || defined(CBR_38400) BAUDENTRY(38400) +#endif +#if defined(B57600) || defined(CBR_57600) BAUDENTRY(57600) +#endif +#if defined(B115200) || defined(CBR_115200) BAUDENTRY(115200) -#ifdef B230400 +#endif +#if defined(B230400) || defined(CBR_230400) BAUDENTRY(230400) #endif -#ifdef B460800 +#if defined(B460800) || defined(CBR_460800) BAUDENTRY(460800) #endif -#ifdef B500000 +#if defined(B500000) || defined(CBR_500000) BAUDENTRY(500000) #endif -#ifdef B576000 +#if defined(B576000) || defined(CBR_576000) BAUDENTRY(576000) #endif -#ifdef B921600 +#if defined(B921600) || defined(CBR_921600) BAUDENTRY(921600) #endif -#ifdef B1000000 +#if defined(B1000000) || defined(CBR_1000000) BAUDENTRY(1000000) #endif -#ifdef B1152000 +#if defined(B1152000) || defined(CBR_1152000) BAUDENTRY(1152000) #endif -#ifdef B1500000 +#if defined(B1500000) || defined(CBR_1500000) BAUDENTRY(1500000) #endif -#ifdef B2000000 +#if defined(B2000000) || defined(CBR_2000000) BAUDENTRY(2000000) #endif -#ifdef B2500000 +#if defined(B2500000) || defined(CBR_2500000) BAUDENTRY(2500000) #endif -#ifdef B3000000 +#if defined(B3000000) || defined(CBR_3000000) BAUDENTRY(3000000) #endif -#ifdef B3500000 +#if defined(B3500000) || defined(CBR_3500000) BAUDENTRY(3500000) #endif -#ifdef B4000000 +#if defined(B4000000) || defined(CBR_4000000) BAUDENTRY(4000000) #endif {0, 0} /* Terminator */ }; -#endif + +const struct baudentry *round_baud(unsigned int baud) +{ + int i; + /* Round baud rate to next lower entry in sp_baudtable if it exists, else use the lowest entry. */ + for (i = ARRAY_SIZE(sp_baudtable) - 2; i >= 0 ; i--) { + if (sp_baudtable[i].baud == baud) + return &sp_baudtable[i]; + + if (sp_baudtable[i].baud < baud) { + msg_pinfo("Warning: given baudrate %d rounded down to %d.\n", + baud, sp_baudtable[i].baud); + return &sp_baudtable[i]; + } + } + return &sp_baudtable[0]; +} /* Uses msg_perr to print the last system error. * Prints "Error: " followed first by \c msg and then by the description of the last error retrieved via @@ -155,15 +188,8 @@ msg_perr_strerror("Could not fetch serial port configuration: "); return SER_INV_FD; } - switch (baud) { - case 9600: dcb.BaudRate = CBR_9600; break; - case 19200: dcb.BaudRate = CBR_19200; break; - case 38400: dcb.BaudRate = CBR_38400; break; - case 57600: dcb.BaudRate = CBR_57600; break; - case 115200: dcb.BaudRate = CBR_115200; break; - default: msg_perr("Error: Could not set baud rate: %s\n", strerror(errno)); - return SER_INV_FD; - } + const struct baudentry *entry = round_baud(baud); + dcb.BaudRate = entry->baud; dcb.ByteSize = 8; dcb.Parity = NOPARITY; dcb.StopBits = ONESTOPBIT; @@ -171,10 +197,15 @@ msg_perr_strerror("Could not change serial port configuration: "); return SER_INV_FD; } + if (!GetCommState(fd, &dcb)) { + msg_perr_strerror("Could not fetch serial port configuration: "); + return SER_INV_FD; + } + msg_pdbg("Baud rate is %ld.\n", dcb.BaudRate); return fd; #else struct termios options; - int fd, i; + int fd; fd = open(dev, O_RDWR | O_NOCTTY | O_NDELAY); if (fd < 0) { msg_perr_strerror("Cannot open serial port: "); @@ -182,18 +213,10 @@ } fcntl(fd, F_SETFL, 0); tcgetattr(fd, &options); - for (i = 0;; i++) { - if (sp_baudtable[i].baud == 0) { - close(fd); - msg_perr("Error: cannot configure for baudrate %d\n", baud); - return SER_INV_FD; - } - if (sp_baudtable[i].baud == baud) { - cfsetispeed(&options, sp_baudtable[i].flag); - cfsetospeed(&options, sp_baudtable[i].flag); - break; - } - } + const struct baudentry *entry = round_baud(baud); + cfsetispeed(&options, entry->flag); + cfsetospeed(&options, entry->flag); + msg_pdbg("Setting baud rate to %d.\n", entry->baud); options.c_cflag &= ~(PARENB | CSTOPB | CSIZE | CRTSCTS); options.c_cflag |= (CS8 | CLOCAL | CREAD); options.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG);

1 0

[commit] r1659 - trunk
by repository service 31 Mar '13

31 Mar '13

Author: stefanct Date: Mon Apr 1 02:45:08 2013 New Revision: 1659 URL: http://flashrom.org/trac/flashrom/changeset/1659 Log: serial.c: abstract system error printing. Windows is awkward. The win32 API does not support errno/strerror as one might expect. Introduce a new msg_* function that alleviates the pain a bit (my head still hurts very badly). Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/serial.c Modified: trunk/serial.c ============================================================================== --- trunk/serial.c Wed Mar 27 14:00:23 2013 (r1658) +++ trunk/serial.c Mon Apr 1 02:45:08 2013 (r1659) @@ -104,17 +104,39 @@ }; #endif +/* Uses msg_perr to print the last system error. + * Prints "Error: " followed first by \c msg and then by the description of the last error retrieved via + * strerror() or FormatMessage() and ending with a linebreak. */ +static void msg_perr_strerror(const char *msg) +{ + msg_perr("Error: %s", msg); +#ifdef _WIN32 + char *lpMsgBuf; + DWORD nErr = GetLastError(); + FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, nErr, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &lpMsgBuf, 0, NULL); + msg_perr(lpMsgBuf); + /* At least some formatted messages contain a line break at the end. Make sure to always print one */ + if (lpMsgBuf[strlen(lpMsgBuf)-1] != '\n') + msg_perr("\n"); + LocalFree(lpMsgBuf); +#else + msg_perr("%s\n", strerror(errno)); +#endif +} + fdtype sp_openserport(char *dev, unsigned int baud) { #ifdef _WIN32 HANDLE fd; char *dev2 = dev; - if ((strlen(dev) > 3) && (tolower((unsigned char)dev[0]) == 'c') && + if ((strlen(dev) > 3) && + (tolower((unsigned char)dev[0]) == 'c') && (tolower((unsigned char)dev[1]) == 'o') && (tolower((unsigned char)dev[2]) == 'm')) { dev2 = malloc(strlen(dev) + 5); if (!dev2) { - msg_perr("Error: Out of memory: %s\n", strerror(errno)); + msg_perr_strerror("Out of memory: "); return SER_INV_FD; } strcpy(dev2, "\\\\.\\"); @@ -125,12 +147,12 @@ if (dev2 != dev) free(dev2); if (fd == INVALID_HANDLE_VALUE) { - msg_perr("Error: cannot open serial port: %s\n", strerror(errno)); + msg_perr_strerror("Cannot open serial port: "); return SER_INV_FD; } DCB dcb; if (!GetCommState(fd, &dcb)) { - msg_perr("Error: Could not fetch serial port configuration: %s\n", strerror(errno)); + msg_perr_strerror("Could not fetch serial port configuration: "); return SER_INV_FD; } switch (baud) { @@ -146,7 +168,7 @@ dcb.Parity = NOPARITY; dcb.StopBits = ONESTOPBIT; if (!SetCommState(fd, &dcb)) { - msg_perr("Error: Could not change serial port configuration: %s\n", strerror(errno)); + msg_perr_strerror("Could not change serial port configuration: "); return SER_INV_FD; } return fd; @@ -155,7 +177,7 @@ int fd, i; fd = open(dev, O_RDWR | O_NOCTTY | O_NDELAY); if (fd < 0) { - msg_perr("Error: cannot open serial port: %s\n", strerror(errno)); + msg_perr_strerror("Cannot open serial port: "); return SER_INV_FD; } fcntl(fd, F_SETFL, 0);

1 0

[PATCH 7/7] lpt_bitbang_spi.c: wiggler tested OK
by Maksim Kuleshov 31 Mar '13

31 Mar '13

>From 4bae0c9b70dbf308f80abaded36704bef43891e3 Mon Sep 17 00:00:00 2001 From: Maksim Kuleshov <mmcx(a)mail.ru> Date: Sun, 31 Mar 2013 03:15:41 +0400 Subject: [PATCH 7/7] lpt_bitbang_spi.c: wiggler tested OK Signed-off-by: Maksim Kuleshov <mmcx(a)mail.ru> --- lpt_bitbang_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lpt_bitbang_spi.c b/lpt_bitbang_spi.c index 12e41ba..f65d6f8 100644 --- a/lpt_bitbang_spi.c +++ b/lpt_bitbang_spi.c @@ -126,7 +126,7 @@ static struct lpt_bitbang_spi_programmer prog_atmel_stk200 = { static struct lpt_bitbang_spi_programmer prog_wiggler_lpt = { .type = "wiggler", - .status = NT, + .status = OK, .description = "Wiggler LPT", .url = "http://wiki.openwrt.org/doc/hardware/port.jtag.cable.buffered", .spi_cs = {LPT_OUT_PIN_3, 0}, -- 1.7.10.4

1 0

[PATCH 6/7] lpt_bitbang_spi.c: byteblastermv tested OK
by Maksim Kuleshov 31 Mar '13

31 Mar '13

>From 5548a865d8c9235f292c33583849f75042196289 Mon Sep 17 00:00:00 2001 From: Maksim Kuleshov <mmcx(a)mail.ru> Date: Sat, 30 Mar 2013 22:02:57 +0400 Subject: [PATCH 6/7] lpt_bitbang_spi.c: byteblastermv tested OK Signed-off-by: Maksim Kuleshov <mmcx(a)mail.ru> --- lpt_bitbang_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lpt_bitbang_spi.c b/lpt_bitbang_spi.c index 2350e2b..12e41ba 100644 --- a/lpt_bitbang_spi.c +++ b/lpt_bitbang_spi.c @@ -100,7 +100,7 @@ static struct lpt_bitbang_spi_programmer prog_xilinx_dlc5 = { static struct lpt_bitbang_spi_programmer prog_altera_byteblastermv = { .type = "byteblaster", - .status = NT, + .status = OK, .description = "Altera ByteBlasterMV", .url = "ftp://ftp.altera.com/pub/lit_req/document/ds/dsbytemv.pdf", .spi_cs = {LPT_OUT_PIN_3, 0}, -- 1.7.10.4

1 0

[PATCH 5/7] integration lpt_bitbang_spi to Makefile, flashrom.c, programmer.h
by Maksim Kuleshov 31 Mar '13

31 Mar '13

>From e24b6fa25ad8917549b5d72c16baee0bff0ae9c6 Mon Sep 17 00:00:00 2001 From: Maksim Kuleshov <mmcx(a)mail.ru> Date: Sun, 31 Mar 2013 15:37:34 +0400 Subject: [PATCH 5/7] integration lpt_bitbang_spi to Makefile, flashrom.c, programmer.h Signed-off-by: Maksim Kuleshov <mmcx(a)mail.ru> --- Makefile | 25 +++++++++++++++++++++++++ flashrom.c | 13 +++++++++++++ programmer.h | 11 +++++++++++ 3 files changed, 49 insertions(+) diff --git a/Makefile b/Makefile index b948996..6505f28 100644 --- a/Makefile +++ b/Makefile @@ -155,6 +155,11 @@ UNSUPPORTED_FEATURES += CONFIG_RAYER_SPI=yes else override CONFIG_RAYER_SPI = no endif +ifeq ($(CONFIG_LPT_BITBANG_SPI), yes) +UNSUPPORTED_FEATURES += CONFIG_LPT_BITBANG_SPI=yes +else +override CONFIG_LPT_BITBANG_SPI = no +endif ifeq ($(CONFIG_NIC3COM), yes) UNSUPPORTED_FEATURES += CONFIG_NIC3COM=yes else @@ -279,6 +284,11 @@ UNSUPPORTED_FEATURES += CONFIG_RAYER_SPI=yes else override CONFIG_RAYER_SPI = no endif +ifeq ($(CONFIG_LPT_BITBANG_SPI), yes) +UNSUPPORTED_FEATURES += CONFIG_LPT_BITBANG_SPI=yes +else +override CONFIG_LPT_BITBANG_SPI = no +endif ifeq ($(CONFIG_ATAHPT), yes) UNSUPPORTED_FEATURES += CONFIG_ATAHPT=yes else @@ -330,6 +340,9 @@ CONFIG_SERPROG ?= yes # RayeR SPIPGM hardware support CONFIG_RAYER_SPI ?= yes +# LPT_BITBANG_SPI hardware support +CONFIG_LPT_BITBANG_SPI ?= yes + # PonyProg2000 SPI hardware support CONFIG_PONY_SPI ?= yes @@ -389,6 +402,9 @@ CONFIG_PRINT_WIKI ?= no ifeq ($(CONFIG_RAYER_SPI), yes) override CONFIG_BITBANG_SPI = yes else +ifeq ($(CONFIG_LPT_BITBANG_SPI), yes) +override CONFIG_BITBANG_SPI = yes +else ifeq ($(CONFIG_PONY_SPI), yes) override CONFIG_BITBANG_SPI = yes else @@ -407,6 +423,7 @@ endif endif endif endif +endif ############################################################################### # Programmer drivers and programmer support infrastructure. @@ -438,6 +455,14 @@ PROGRAMMER_OBJS += rayer_spi.o NEED_PCI := yes endif +ifeq ($(CONFIG_LPT_BITBANG_SPI), yes) +FEATURE_CFLAGS += -D'CONFIG_LPT_BITBANG_SPI=1' +PROGRAMMER_OBJS += lpt_io.o +PROGRAMMER_OBJS += lpt_bitbang_spi.o +# Actually, NEED_PCI is wrong. NEED_IOPORT_ACCESS would be more correct. +NEED_PCI := yes +endif + ifeq ($(CONFIG_PONY_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_PONY_SPI=1' PROGRAMMER_OBJS += pony_spi.o diff --git a/flashrom.c b/flashrom.c index 225b6f0..b0c73f9 100644 --- a/flashrom.c +++ b/flashrom.c @@ -235,6 +235,19 @@ const struct programmer_entry programmer_table[] = { }, #endif +#if CONFIG_LPT_BITBANG_SPI == 1 + { + .name = "lpt_bitbang_spi", + .type = OTHER, + /* FIXME */ + .devs.note = "generic parallel port spi programmers\n", + .init = lpt_bitbang_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + #if CONFIG_PONY_SPI == 1 { .name = "pony_spi", diff --git a/programmer.h b/programmer.h index 51a8c80..8c9350b 100644 --- a/programmer.h +++ b/programmer.h @@ -69,6 +69,9 @@ enum programmer { #if CONFIG_RAYER_SPI == 1 PROGRAMMER_RAYER_SPI, #endif +#if CONFIG_LPT_BITBANG_SPI == 1 + PROGRAMMER_LPT_BITBANG_SPI, +#endif #if CONFIG_PONY_SPI == 1 PROGRAMMER_PONY_SPI, #endif @@ -130,6 +133,9 @@ enum bitbang_spi_master_type { #if CONFIG_RAYER_SPI == 1 BITBANG_SPI_MASTER_RAYER, #endif +#if CONFIG_LPT_BITBANG_SPI == 1 + BITBANG_SPI_MASTER_LPT_BITBANG, +#endif #if CONFIG_PONY_SPI == 1 BITBANG_SPI_MASTER_PONY, #endif @@ -436,6 +442,11 @@ extern const struct dev_entry devs_ft2232spi[]; int rayer_spi_init(void); #endif +/* lpt_bitbang_spi.c */ +#if CONFIG_LPT_BITBANG_SPI == 1 +int lpt_bitbang_spi_init(void); +#endif + /* pony_spi.c */ #if CONFIG_PONY_SPI == 1 int pony_spi_init(void); -- 1.7.10.4

1 0

[PATCH 4/7] add lpt_bitbang_spi based on rayer_spi
by Maksim Kuleshov 31 Mar '13

31 Mar '13

From 05f717c81da603472988e31c63a2c082fef6c491 Mon Sep 17 00:00:00 2001 From: Maksim Kuleshov <mmcx(a)mail.ru> Date: Sun, 31 Mar 2013 17:41:12 +0400 Subject: [PATCH 4/7] add lpt_bitbang_spi based on rayer_spi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit add lpt_bitbang_spi based on rayer_spi Integrated patchs: [flashrom] [PATCH (1-5)/5] rayer_spi: Create list of programmer types Wed Mar 6 23:48:43 CET 2013 Kyösti Mälkki [flashrom] [PATCH (0-3)/3] rayer_spi: Add support for Willem EPROM programmer SPI Sat Mar 16 23:42:50 CET 2013 Ondrej Zary Signed-off-by: Maksim Kuleshov <mmcx(a)mail.ru> --- lpt_bitbang_spi.c | 406 +++++++++++++++++++++++++++++++++++++++++++++++++++++ lpt_bitbang_spi.h | 6 + 2 files changed, 412 insertions(+) create mode 100644 lpt_bitbang_spi.c create mode 100644 lpt_bitbang_spi.h diff --git a/lpt_bitbang_spi.c b/lpt_bitbang_spi.c new file mode 100644 index 0000000..2350e2b --- /dev/null +++ b/lpt_bitbang_spi.c @@ -0,0 +1,406 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2009,2010 Carl-Daniel Hailfinger + * Copyright (C) 2013 Kyösti Mälkki + * Copyright (C) 2013 Ondrej Zary + * Copyright (C) 2013 Maksim Kuleshov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <stdlib.h> +#include <strings.h> +#include <string.h> +#include "lpt_bitbang_spi.h" + +#include "flash.h" +#include "programmer.h" + +#include "lpt_io.h" + +typedef uint_fast16_t pins_mask_t; + +struct lpt_bitbang_spi_pin { + pins_mask_t set_mask; + pins_mask_t clear_mask; +}; + +struct lpt_bitbang_spi_programmer { + const char *type; + const enum test_state status; + const char *description; + const char *url; + struct lpt_bitbang_spi_pin spi_cs; + struct lpt_bitbang_spi_pin spi_sck; + struct lpt_bitbang_spi_pin spi_miso; + struct lpt_bitbang_spi_pin spi_mosi; + struct lpt_bitbang_spi_pin on_enable; + struct lpt_bitbang_spi_pin on_disable; + int (*preinit) (void *data); + int (*shutdown) (void *data); +}; + +enum { + LPT_OUT_PIN_1 = (1UL << (0 + 8)), + LPT_OUT_PIN_2 = (1UL << 0), + LPT_OUT_PIN_3 = (1UL << 1), + LPT_OUT_PIN_4 = (1UL << 2), + LPT_OUT_PIN_5 = (1UL << 3), + LPT_OUT_PIN_6 = (1UL << 4), + LPT_OUT_PIN_7 = (1UL << 5), + LPT_OUT_PIN_8 = (1UL << 6), + LPT_OUT_PIN_9 = (1UL << 7), + LPT_OUT_PIN_14 = (1UL << (1 + 8)), + LPT_OUT_PIN_15 = (1UL << 3), + LPT_OUT_PIN_16 = (1UL << (2 + 8)), + LPT_OUT_PIN_17 = (1UL << (3 + 8)), + + LPT_IN_PIN_10 = (1UL << 6), + LPT_IN_PIN_11 = (1UL << 7), + LPT_IN_PIN_12 = (1UL << 5), + LPT_IN_PIN_13 = (1UL << 4), +}; + +static struct lpt_bitbang_spi_programmer prog_rayer_spipgm = { + .type = "rayer", + .status = NT, + .description = "SPIPGM hardware by \"RayeR\" Martin Rehak", + .url = "http://rayer.ic.cz/elektro/spipgm.htm", + .spi_cs = {LPT_OUT_PIN_7, 0}, + .spi_sck = {LPT_OUT_PIN_8, 0}, + .spi_mosi = {LPT_OUT_PIN_9, 0}, + .spi_miso = {LPT_IN_PIN_10, 0}, +}; + +static struct lpt_bitbang_spi_programmer prog_xilinx_dlc5 = { + .type = "xilinx", + .status = NT, + .description = "Xilinx Parallel Cable III (DLC 5)", + .url = + "http://www.xilinx.com/support/documentation/user_guides/xtp029.pdf", + .spi_cs = {LPT_OUT_PIN_4, 0}, + .spi_sck = {LPT_OUT_PIN_3, 0}, + .spi_mosi = {LPT_OUT_PIN_2, 0}, + .spi_miso = {LPT_IN_PIN_13, 0}, + .on_enable = {LPT_OUT_PIN_6, LPT_OUT_PIN_5}, + .on_disable = {LPT_OUT_PIN_6 | LPT_OUT_PIN_5, 0}, +}; + +static struct lpt_bitbang_spi_programmer prog_altera_byteblastermv = { + .type = "byteblaster", + .status = NT, + .description = "Altera ByteBlasterMV", + .url = "ftp://ftp.altera.com/pub/lit_req/document/ds/dsbytemv.pdf", + .spi_cs = {LPT_OUT_PIN_3, 0}, + .spi_sck = {LPT_OUT_PIN_2, 0}, + .spi_mosi = {LPT_OUT_PIN_8, 0}, + .spi_miso = {LPT_IN_PIN_11, 0}, + .on_enable = {0, LPT_OUT_PIN_14}, + .on_disable = {LPT_OUT_PIN_14, 0}, +}; + +static struct lpt_bitbang_spi_programmer prog_atmel_stk200 = { + .type = "stk200", + .status = NT, + .description = "Atmel STK200/300 adapter", + .url = "http://real.kiev.ua/old/avreal/en/adapters.html#STK", + .spi_cs = {LPT_OUT_PIN_9, 0}, + .spi_sck = {LPT_OUT_PIN_6, 0}, + .spi_mosi = {LPT_OUT_PIN_7, 0}, + .spi_miso = {LPT_IN_PIN_10, 0}, + .on_enable = {0, LPT_OUT_PIN_4 | LPT_OUT_PIN_5}, + .on_disable = {LPT_OUT_PIN_4 | LPT_OUT_PIN_5, 0}, +}; + +static struct lpt_bitbang_spi_programmer prog_wiggler_lpt = { + .type = "wiggler", + .status = NT, + .description = "Wiggler LPT", + .url = "http://wiki.openwrt.org/doc/hardware/port.jtag.cable.buffered", + .spi_cs = {LPT_OUT_PIN_3, 0}, + .spi_sck = {LPT_OUT_PIN_4, 0}, + .spi_mosi = {LPT_OUT_PIN_5, 0}, + .spi_miso = {LPT_IN_PIN_11, 0}, +}; + +static struct lpt_bitbang_spi_programmer prog_willem_spi = { + .type = "willem", + .status = NT, + .description = "Willem EPROM Programmer SPI", + .spi_cs = {LPT_OUT_PIN_17, 0}, + .spi_sck = {LPT_OUT_PIN_3, 0}, + .spi_mosi = {0, LPT_OUT_PIN_2}, + .spi_miso = {LPT_IN_PIN_11, 0}, + .on_enable = {LPT_OUT_PIN_16 | LPT_OUT_PIN_14 | LPT_OUT_PIN_1, 0}, + .on_disable = {LPT_OUT_PIN_1, LPT_OUT_PIN_16 | LPT_OUT_PIN_14}, +}; + +static struct lpt_bitbang_spi_programmer *lpt_bitbang_spi_types[] = { + &prog_rayer_spipgm, + &prog_xilinx_dlc5, + &prog_altera_byteblastermv, + &prog_atmel_stk200, + &prog_wiggler_lpt, + &prog_willem_spi, + NULL +}; + +static struct lpt_bitbang_spi_programmer *programmer = NULL; +static lpt_io_context_t lpt_io_context = NULL; +static pins_mask_t lpt_pins_state_cached = 0; + +#define LOBYTE(value) ((value) & 0xff) +#define HIBYTE(value) (((value)>>8) & 0xff) + +static void lpt_bitbang_out_pins(pins_mask_t lpt_pins_state) +{ + lpt_io_out_data(lpt_io_context, LOBYTE(lpt_pins_state)); + lpt_io_out_control(lpt_io_context, HIBYTE(lpt_pins_state)); + lpt_pins_state_cached = lpt_pins_state; +} + +static void lpt_bitbang_change_pins(pins_mask_t set_mask, + pins_mask_t clear_mask) +{ + pins_mask_t lpt_pins_state = lpt_pins_state_cached; + lpt_pins_state |= set_mask; + lpt_pins_state &= ~clear_mask; + + if (LOBYTE(lpt_pins_state) != LOBYTE(lpt_pins_state_cached)) { + lpt_io_out_data(lpt_io_context, LOBYTE(lpt_pins_state)); + } + + if (HIBYTE(lpt_pins_state) != HIBYTE(lpt_pins_state_cached)) { + lpt_io_out_control(lpt_io_context, HIBYTE(lpt_pins_state)); + } + + lpt_pins_state_cached = lpt_pins_state; +} + +static void lpt_bitbang_spi_set_pin(struct lpt_bitbang_spi_pin *pin, int val) +{ + if (val) { + lpt_bitbang_change_pins(pin->set_mask, pin->clear_mask); + + } else { + lpt_bitbang_change_pins(pin->clear_mask, pin->set_mask); + } +} + +static inline int lpt_bitbang_spi_get_pin(struct lpt_bitbang_spi_pin *pin) +{ + uint8_t tmp = lpt_io_in_status(lpt_io_context); + return ((tmp & pin->set_mask) | (~tmp & pin->clear_mask)) != 0; +} + +static void lpt_bitbang_spi_set_cs(int val) +{ + lpt_bitbang_spi_set_pin(&programmer->spi_cs, val); +} + +static void lpt_bitbang_spi_set_sck(int val) +{ + lpt_bitbang_spi_set_pin(&programmer->spi_sck, val); +} + +static void lpt_bitbang_spi_set_mosi(int val) +{ + lpt_bitbang_spi_set_pin(&programmer->spi_mosi, val); +} + +static int lpt_bitbang_spi_get_miso(void) +{ + return lpt_bitbang_spi_get_pin(&programmer->spi_miso); +} + +static int lpt_bitbang_spi_generic_preinit(void *data) +{ + struct lpt_bitbang_spi_programmer *prog = + (struct lpt_bitbang_spi_programmer *)data; + msg_pdbg("%s preinit\n", prog->type); + lpt_bitbang_spi_set_pin(&prog->on_enable, 1); + return 0; +} + +static int lpt_bitbang_spi_generic_shutdown(void *data) +{ + struct lpt_bitbang_spi_programmer *prog = + (struct lpt_bitbang_spi_programmer *)data; + msg_pdbg("%s shutdown\n", prog->type); + lpt_bitbang_spi_set_pin(&prog->spi_cs, 1); + lpt_bitbang_spi_set_pin(&prog->on_disable, 1); + return 0; +} + +static const struct bitbang_spi_master lpt_bitbang_spi_master = { + .type = BITBANG_SPI_MASTER_RAYER, + .set_cs = lpt_bitbang_spi_set_cs, + .set_sck = lpt_bitbang_spi_set_sck, + .set_mosi = lpt_bitbang_spi_set_mosi, + .get_miso = lpt_bitbang_spi_get_miso, + .half_period = 0, +}; + +static int lpt_bitbang_spi_io_init(void *data) +{ + (void)data; + int io_selected = 0; + + if (!io_selected) { + char *arg = extract_programmer_param("ppdev"); + + if (arg) { + int err; + msg_pdbg("Using ppdev=%s for parallel port access.\n", + arg); + err = + lpt_io_init(&lpt_io_context, "ppdev", (void *)arg); + free(arg); + io_selected = 1; + + if (err) { + return err; + } + } + } + + if (!io_selected) { + char *arg = extract_programmer_param("iobase"); + + if (arg) { + int err; + char *endptr = NULL; + unsigned long iobase = strtoul(arg, &endptr, 0); + free(arg); + io_selected = 2; + + /* Port 0, port >0x10000, unaligned ports and garbage strings + * are rejected. + */ + if ((iobase <= 0x100) || (iobase >= 0x10000) + || (iobase & 0x3) || (*endptr != '\0')) { + /* Using ports below 0x100 is a really bad idea, and + * should only be done if no port between 0x100 and + * 0xfffc works due to routing issues. + */ + msg_perr + ("Error: iobase= specified, but the I/O base " + "given was invalid.\nIt must be a multiple of " + "0x4 and lie between 0x100 and 0xfffc.\n"); + return 1; + + } else { + msg_pinfo + ("Using address 0x%lx as I/O base for parallel port access.\n", + iobase); + err = + lpt_io_init(&lpt_io_context, "direct", + (void *)&iobase); + + if (err) { + return err; + } + } + } + } + + if (!io_selected) { + int err; + /* Pick a default value for the I/O base. */ + unsigned long iobase = 0x378; + io_selected = 3; + msg_pdbg + ("Using address 0x%lx as I/O base for parallel port access.\n", + iobase); + err = lpt_io_init(&lpt_io_context, "direct", (void *)&iobase); + + if (err) { + return err; + } + } + + if (!io_selected) { + msg_perr("not awailable lpt_io method\n"); + return 1; + } + + /* Get the initial value before writing to any line. */ + lpt_bitbang_out_pins(lpt_io_in_data(lpt_io_context)); + return 0; +} + +int lpt_bitbang_spi_init(void) +{ + struct lpt_bitbang_spi_programmer **prog = lpt_bitbang_spi_types; + char *arg = NULL; + programmer = *prog; + arg = extract_programmer_param("type"); + + if (arg) { + for (; *prog; ++prog) { + if (0 == strcasecmp(arg, (*prog)->type)) { + break; + } + } + + free(arg); + + if (!*prog) { + msg_perr("Error: Invalid device type specified.\n"); + return 1; + } + } + + msg_pinfo("programmer: %s\n", (*prog)->type); + + if ((*prog)->description) { + msg_pinfo("decription: \"%s\"\n", (*prog)->description); + } + + if ((*prog)->url) { + msg_pinfo("url: \"%s\"\n", (*prog)->url); + } + + programmer = *prog; + + if (lpt_bitbang_spi_io_init(NULL)) { + return 1; + } + + if (programmer->shutdown) { + register_shutdown(programmer->shutdown, (void *)programmer); + + } else { + register_shutdown(lpt_bitbang_spi_generic_shutdown, + (void *)programmer); + } + + if (programmer->preinit) { + if (programmer->preinit(programmer)) { + return 1; + } + + } else { + if (lpt_bitbang_spi_generic_preinit(programmer)) { + return 1; + } + } + + if (bitbang_spi_init(&lpt_bitbang_spi_master)) { + return 1; + } + + return 0; +} diff --git a/lpt_bitbang_spi.h b/lpt_bitbang_spi.h new file mode 100644 index 0000000..901628a --- /dev/null +++ b/lpt_bitbang_spi.h @@ -0,0 +1,6 @@ +#ifndef lpt_bitbang_spi_h_included_ +#define lpt_bitbang_spi_h_included_ + +int lpt_bitbang_spi_init(void); + +#endif -- 1.7.10.4

1 0

[PATCH 3/7] add lpt_io_ppdev to lpt_io module
by Maksim Kuleshov 31 Mar '13

31 Mar '13

>From 2ad179bbd009efb3d891be7d00f1e4104840c659 Mon Sep 17 00:00:00 2001 From: Maksim Kuleshov <mmcx(a)mail.ru> Date: Sat, 30 Mar 2013 21:32:48 +0400 Subject: [PATCH 3/7] add lpt_io_ppdev to lpt_io module Signed-off-by: Maksim Kuleshov <mmcx(a)mail.ru> --- lpt_io.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ lpt_io.h | 1 + 2 files changed, 131 insertions(+) diff --git a/lpt_io.c b/lpt_io.c index e388cd5..b4fe2ab 100644 --- a/lpt_io.c +++ b/lpt_io.c @@ -102,10 +102,140 @@ static int lpt_io_direct_init(lpt_io_context_t * p_context, void *data) } #endif +#ifdef HAVE_PPDEV_IO +#include <fcntl.h> +#include <unistd.h> +#include <sys/ioctl.h> +#include <errno.h> +#include <string.h> +#include <linux/ppdev.h> +#include <linux/parport.h> + +static struct lpt_io_private_ppdev { + int fd; +} lpt_io_private_ppdev; + +static int lpt_io_ppdev_shutdown(void *data) +{ + struct lpt_io_driver *driver = data; + struct lpt_io_private_ppdev *private = driver->private; + + if (private->fd >= 0) { + ioctl(private->fd, PPRELEASE); + close(private->fd); + private->fd = -1; + } + + return 0; +} + +static void lpt_io_ppdev_out_data(lpt_io_context_t context, uint8_t data) +{ + struct lpt_io_driver *driver = context; + struct lpt_io_private_ppdev *private = driver->private; + + if (private->fd >= 0) { + ioctl(private->fd, PPWDATA, &data); + } +} + +static void lpt_io_ppdev_out_control(lpt_io_context_t context, uint8_t data) +{ + struct lpt_io_driver *driver = context; + struct lpt_io_private_ppdev *private = driver->private; + + if (private->fd >= 0) { + ioctl(private->fd, PPWCONTROL, &data); + } +} + +static uint8_t lpt_io_ppdev_in_data(lpt_io_context_t context) +{ + struct lpt_io_driver *driver = context; + struct lpt_io_private_ppdev *private = driver->private; + uint8_t data = 0; + + if (private->fd >= 0) { + ioctl(private->fd, PPRDATA, &data); + } + + return data; +} + +static uint8_t lpt_io_ppdev_in_status(lpt_io_context_t context) +{ + struct lpt_io_driver *driver = context; + struct lpt_io_private_ppdev *private = driver->private; + uint8_t data = 0; + + if (private->fd >= 0) { + ioctl(private->fd, PPRSTATUS, &data); + } + + return data; +} + +static uint8_t lpt_io_ppdev_in_control(lpt_io_context_t context) +{ + struct lpt_io_driver *driver = context; + struct lpt_io_private_ppdev *private = driver->private; + uint8_t data = 0; + + if (private->fd >= 0) { + ioctl(private->fd, PPRCONTROL, &data); + } + + return data; +} + +static int lpt_io_ppdev_init(lpt_io_context_t * p_context, void *data); + +static struct lpt_io_driver lpt_io_driver_ppdev = { + .method = "ppdev", + .init = lpt_io_ppdev_init, + .out_data = lpt_io_ppdev_out_data, + .out_control = lpt_io_ppdev_out_control, + .in_data = lpt_io_ppdev_in_data, + .in_status = lpt_io_ppdev_in_status, + .in_control = lpt_io_ppdev_in_control, + .shutdown = lpt_io_ppdev_shutdown, +}; + +static int lpt_io_ppdev_init(lpt_io_context_t * p_context, void *data) +{ + struct lpt_io_driver *driver = &lpt_io_driver_ppdev; + struct lpt_io_private_ppdev *private = &lpt_io_private_ppdev; + driver->private = (void *)private; + char *ppdev_name = (char *)data; + private->fd = open(ppdev_name, O_RDWR | O_NONBLOCK); + + if (private->fd < 0) { + msg_perr("Error: ppdev=%s not opened (%s)\n", ppdev_name, + strerror(errno)); + return 1; + } + + if (ioctl(private->fd, PPCLAIM) < 0) { + msg_perr("Error: ppdev not claimed (%s)\n", strerror(errno)); + return 1; + } + + if (driver->shutdown) { + register_shutdown(driver->shutdown, driver); + } + + *p_context = (lpt_io_context_t) driver; + return 0; +} +#endif + static struct lpt_io_driver *lpt_io_drivers[] = { #ifdef HAVE_DIRECT_IO &lpt_io_driver_direct, #endif +#ifdef HAVE_PPDEV_IO + &lpt_io_driver_ppdev, +#endif NULL }; diff --git a/lpt_io.h b/lpt_io.h index 5777654..2eb9963 100644 --- a/lpt_io.h +++ b/lpt_io.h @@ -1,3 +1,4 @@ +#define HAVE_PPDEV_IO //FIXME must be defined in Makefile #define HAVE_DIRECT_IO //FIXME must be defined in Makefile #ifndef lpt_io_h_included_ #define lpt_io_h_included_ -- 1.7.10.4

1 0

[PATCH 2/7] add lpt_io_direct to lpt_io module
by Maksim Kuleshov 31 Mar '13

31 Mar '13

>From fe925f4b2ca85e1ba31e9f4deb5c13f725621f25 Mon Sep 17 00:00:00 2001 From: Maksim Kuleshov <mmcx(a)mail.ru> Date: Sat, 30 Mar 2013 21:31:44 +0400 Subject: [PATCH 2/7] add lpt_io_direct to lpt_io module Signed-off-by: Maksim Kuleshov <mmcx(a)mail.ru> --- lpt_io.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ lpt_io.h | 1 + 2 files changed, 91 insertions(+) diff --git a/lpt_io.c b/lpt_io.c index 638f6e9..e388cd5 100644 --- a/lpt_io.c +++ b/lpt_io.c @@ -15,7 +15,97 @@ struct lpt_io_driver { void *private; }; +#ifdef HAVE_DIRECT_IO +#if defined(__i386__) || defined(__x86_64__) +#include "hwaccess.h" +extern int rget_io_perms(void); +//FIXME 'int rget_io_perms(void)' declared in "programmer.h", not in "hwaccess.h" +#else +#error PCI port I/O access is not supported on this architecture yet. +#endif + +static struct lpt_io_private_direct { + uint16_t iobase; +} lpt_io_private_direct; + +static int lpt_io_direct_shutdown(void *data) +{ + (void)data; + return 0; +} + +static void lpt_io_direct_out_data(lpt_io_context_t context, uint8_t data) +{ + struct lpt_io_driver *driver = context; + struct lpt_io_private_direct *private = driver->private; + OUTB(data, private->iobase + 0); +} + +static void lpt_io_direct_out_control(lpt_io_context_t context, uint8_t data) +{ + struct lpt_io_driver *driver = context; + struct lpt_io_private_direct *private = driver->private; + OUTB(data, private->iobase + 2); +} + +static uint8_t lpt_io_direct_in_data(lpt_io_context_t context) +{ + struct lpt_io_driver *driver = context; + struct lpt_io_private_direct *private = driver->private; + return INB(private->iobase + 0); +} + +static uint8_t lpt_io_direct_in_status(lpt_io_context_t context) +{ + struct lpt_io_driver *driver = context; + struct lpt_io_private_direct *private = driver->private; + return INB(private->iobase + 1); +} + +static uint8_t lpt_io_direct_in_control(lpt_io_context_t context) +{ + struct lpt_io_driver *driver = context; + struct lpt_io_private_direct *private = driver->private; + return INB(private->iobase + 2); +} + +static int lpt_io_direct_init(lpt_io_context_t * p_context, void *data); + +static struct lpt_io_driver lpt_io_driver_direct = { + .method = "direct", + .init = lpt_io_direct_init, + .out_data = lpt_io_direct_out_data, + .out_control = lpt_io_direct_out_control, + .in_data = lpt_io_direct_in_data, + .in_status = lpt_io_direct_in_status, + .in_control = lpt_io_direct_in_control, + .shutdown = lpt_io_direct_shutdown, +}; + +static int lpt_io_direct_init(lpt_io_context_t * p_context, void *data) +{ + struct lpt_io_driver *driver = &lpt_io_driver_direct; + struct lpt_io_private_direct *private = &lpt_io_private_direct; + driver->private = (void *)private; + private->iobase = *(unsigned long *)data; + + if (rget_io_perms()) { + return 1; + } + + if (driver->shutdown) { + register_shutdown(driver->shutdown, driver); + } + + *p_context = (lpt_io_context_t) driver; + return 0; +} +#endif + static struct lpt_io_driver *lpt_io_drivers[] = { +#ifdef HAVE_DIRECT_IO + &lpt_io_driver_direct, +#endif NULL }; diff --git a/lpt_io.h b/lpt_io.h index a4912e8..5777654 100644 --- a/lpt_io.h +++ b/lpt_io.h @@ -1,3 +1,4 @@ +#define HAVE_DIRECT_IO //FIXME must be defined in Makefile #ifndef lpt_io_h_included_ #define lpt_io_h_included_ -- 1.7.10.4

1 0

[PATCH 1/7] add lpt_io module - generic LPT functions
by Maksim Kuleshov 31 Mar '13

31 Mar '13

>From 7237cc639dffe325167cca9909f270aa67afbe68 Mon Sep 17 00:00:00 2001 From: Maksim Kuleshov <mmcx(a)mail.ru> Date: Sat, 30 Mar 2013 21:23:23 +0400 Subject: [PATCH 1/7] add lpt_io module - generic LPT functions Signed-off-by: Maksim Kuleshov <mmcx(a)mail.ru> --- lpt_io.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ lpt_io.h | 14 +++++++++ 2 files changed, 120 insertions(+) create mode 100644 lpt_io.c create mode 100644 lpt_io.h diff --git a/lpt_io.c b/lpt_io.c new file mode 100644 index 0000000..638f6e9 --- /dev/null +++ b/lpt_io.c @@ -0,0 +1,106 @@ +#include <stdint.h> +#include <string.h> +#include "lpt_io.h" +#include "programmer.h" + +struct lpt_io_driver { + const char *method; + int (*init) (lpt_io_context_t * p_context, void *data); + void (*out_data) (lpt_io_context_t context, uint8_t data); + void (*out_control) (lpt_io_context_t context, uint8_t data); + uint8_t(*in_data) (lpt_io_context_t context); + uint8_t(*in_status) (lpt_io_context_t context); + uint8_t(*in_control) (lpt_io_context_t context); + int (*shutdown) (void *data); + void *private; +}; + +static struct lpt_io_driver *lpt_io_drivers[] = { + NULL +}; + +int lpt_io_init(lpt_io_context_t * p_context, const char *method, + void *method_args) +{ + struct lpt_io_driver **p_driver = lpt_io_drivers; + + for (; *p_driver; p_driver++) { + if (0 == strcmp((*p_driver)->method, method)) { + int err = 0; + + if ((*p_driver)->init) { + err = + (*p_driver)->init((void **)p_driver, + method_args); + } + + if (err) { + return err; + } + + *p_context = *p_driver; + return 0; + } + } + + msg_perr("Error: lpt_io_method \"%s\" not supported\n", method); + return 1; +} + +#define LPT_PORT_CONTROL_INTERNAL_INVERSION_MASK 0x0B +#define LPT_PORT_STATUS_INTERNAL_INVERSION_MASK 0x80 + +void lpt_io_out_data(lpt_io_context_t context, uint8_t data) +{ + struct lpt_io_driver *driver = context; + + if (driver && driver->out_data) { + driver->out_data(context, data); + } +} + +void lpt_io_out_control(lpt_io_context_t context, uint8_t data) +{ + data ^= LPT_PORT_CONTROL_INTERNAL_INVERSION_MASK; + struct lpt_io_driver *driver = context; + + if (driver && driver->out_control) { + driver->out_control(context, data); + } +} + +uint8_t lpt_io_in_data(lpt_io_context_t context) +{ + uint8_t data = 0; + struct lpt_io_driver *driver = context; + + if (driver && driver->in_data) { + data = driver->in_data(context); + } + + return data; +} + +uint8_t lpt_io_in_status(lpt_io_context_t context) +{ + uint8_t data = 0; + struct lpt_io_driver *driver = context; + + if (driver && driver->in_status) { + data = driver->in_status(context); + } + + return data ^ LPT_PORT_STATUS_INTERNAL_INVERSION_MASK; +} + +uint8_t lpt_io_in_control(lpt_io_context_t context) +{ + uint8_t data = 0; + struct lpt_io_driver *driver = context; + + if (driver && driver->in_control) { + data = driver->in_control(context); + } + + return data ^ LPT_PORT_CONTROL_INTERNAL_INVERSION_MASK; +} diff --git a/lpt_io.h b/lpt_io.h new file mode 100644 index 0000000..a4912e8 --- /dev/null +++ b/lpt_io.h @@ -0,0 +1,14 @@ +#ifndef lpt_io_h_included_ +#define lpt_io_h_included_ + +typedef void *lpt_io_context_t; + +int lpt_io_init(lpt_io_context_t * p_context, const char *method, + void *method_args); +void lpt_io_out_data(lpt_io_context_t context, uint8_t data); +void lpt_io_out_control(lpt_io_context_t context, uint8_t data); +uint8_t lpt_io_in_data(lpt_io_context_t context); +uint8_t lpt_io_in_status(lpt_io_context_t context); +uint8_t lpt_io_in_control(lpt_io_context_t context); + +#endif -- 1.7.10.4

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom