[flashrom] [commit] r832 - trunk

Author: oxygene
Date: 2010-01-06 23:14:39 +0100 (Wed, 06 Jan 2010)
New Revision: 832

Modified:
   trunk/flash.h
   trunk/serial.c
Log:
buspiratespi support on mingw

Signed-off-by: Patrick Georgi 
Acked-by: Carl-Daniel Hailfinger

Modified: trunk/flash.h
===================================================================
--- trunk/flash.h	2010-01-06 19:09:40 UTC (rev 831)
+++ trunk/flash.h	2010-01-06 22:14:39 UTC (rev 832)
@@ -28,6 +28,11 @@
 #include <stdint.h>
 #include <stdio.h>
 #include "hwaccess.h"
+#ifdef _WIN32
+#include <windows.h>
+#undef min
+#undef max
+#endif

typedef unsigned long chipaddr;

@@ -591,10 +596,16 @@
 void serprog_delay(int delay);

/* serial.c */
+#if _WIN32
+typedef HANDLE fdtype;
+#else
+typedef int fdtype;
+#endif
+
 void sp_flush_incoming(void);
-int sp_openserport(char *dev, unsigned int baud);
+fdtype sp_openserport(char *dev, unsigned int baud);
 void __attribute__((noreturn)) sp_die(char *msg);
-extern int sp_fd;
+extern fdtype sp_fd;
 int serialport_shutdown(void);
 int serialport_write(unsigned char *buf, unsigned int writecnt);
 int serialport_read(unsigned char *buf, unsigned int readcnt);

Modified: trunk/serial.c
===================================================================
--- trunk/serial.c	2010-01-06 19:09:40 UTC (rev 831)
+++ trunk/serial.c	2010-01-06 22:14:39 UTC (rev 832)
@@ -30,9 +30,13 @@
 #include <sys/stat.h>
 #include <errno.h>
 #include <inttypes.h>
+#ifdef _WIN32
+#include <conio.h>
+#else
 #include <termios.h>
+#endif

-int sp_fd;
+fdtype sp_fd;

void __attribute__((noreturn)) sp_die(char *msg)
 {
@@ -40,6 +44,7 @@
    exit(1);
 }

+#ifndef _WIN32
 struct baudentry {
    int flag;
    unsigned int baud;
@@ -94,9 +99,36 @@
 #endif
    {0, 0}			/* Terminator */
 };
+#endif

-int sp_openserport(char *dev, unsigned int baud)
+fdtype sp_openserport(char *dev, unsigned int baud)
 {
+#ifdef _WIN32
+	HANDLE fd;
+	fd = CreateFile(dev, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL);
+	if (fd == INVALID_HANDLE_VALUE) {
+		sp_die("Error: cannot open serial port");
+	}
+	DCB dcb;
+	if (!GetCommState(fd, &dcb)) {
+		sp_die("Error: Could not fetch serial port configuration");
+	}
+	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: sp_die("Error: Could not set baud rate");
+	}
+	dcb.ByteSize=8;
+	dcb.Parity=NOPARITY;
+	dcb.StopBits=ONESTOPBIT;
+	if (!SetCommState(fd, &dcb)) {
+		sp_die("Error: Could not change serial port configuration");
+	}
+	return fd;
+#else
    struct termios options;
    int fd, i;
    fd = open(dev, O_RDWR | O_NOCTTY | O_NDELAY);
@@ -125,26 +157,39 @@
    options.c_oflag &= ~OPOST;
    tcsetattr(fd, TCSANOW, &options);
    return fd;
+#endif
 }

void sp_flush_incoming(void)
 {
+#ifdef _WIN32
+	PurgeComm(sp_fd, PURGE_RXCLEAR);
+#else
    tcflush(sp_fd, TCIFLUSH);
+#endif
    return;
 }

int serialport_shutdown(void)
 {
+#ifdef _WIN32
+	CloseHandle(sp_fd);
+#else
    close(sp_fd);
+#endif
    return 0;
 }

int serialport_write(unsigned char *buf, unsigned int writecnt)
 {
-	int tmp = 0;
+	long tmp = 0;

while (writecnt > 0) {
+#ifdef _WIN32
+		WriteFile(sp_fd, buf, writecnt, &tmp, NULL);
+#else
    	tmp = write(sp_fd, buf, writecnt);
+#endif
    	if (tmp == -1)
    		return 1;
    	if (!tmp)
@@ -158,10 +203,14 @@

int serialport_read(unsigned char *buf, unsigned int readcnt)
 {
-	int tmp = 0;
+	long tmp = 0;

while (readcnt > 0) {
+#ifdef _WIN32
+		ReadFile(sp_fd, buf, readcnt, &tmp, NULL);
+#else
    	tmp = read(sp_fd, buf, readcnt);
+#endif
    	if (tmp == -1)
    		return 1;
    	if (!tmp)