1
0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-28 07:23:43 +02:00

Buspiratespi support on mingw

Corresponding to flashrom svn r832.

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
This commit is contained in:
Patrick Georgi 2010-01-06 22:14:39 +00:00 committed by Patrick Georgi
parent 3b6237dbce
commit e48654cf70
2 changed files with 66 additions and 6 deletions

15
flash.h
View File

@ -28,6 +28,11 @@
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include "hwaccess.h" #include "hwaccess.h"
#ifdef _WIN32
#include <windows.h>
#undef min
#undef max
#endif
typedef unsigned long chipaddr; typedef unsigned long chipaddr;
@ -591,10 +596,16 @@ void serprog_chip_readn(uint8_t *buf, const chipaddr addr, size_t len);
void serprog_delay(int delay); void serprog_delay(int delay);
/* serial.c */ /* serial.c */
#if _WIN32
typedef HANDLE fdtype;
#else
typedef int fdtype;
#endif
void sp_flush_incoming(void); 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); void __attribute__((noreturn)) sp_die(char *msg);
extern int sp_fd; extern fdtype sp_fd;
int serialport_shutdown(void); int serialport_shutdown(void);
int serialport_write(unsigned char *buf, unsigned int writecnt); int serialport_write(unsigned char *buf, unsigned int writecnt);
int serialport_read(unsigned char *buf, unsigned int readcnt); int serialport_read(unsigned char *buf, unsigned int readcnt);

View File

@ -30,9 +30,13 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <errno.h> #include <errno.h>
#include <inttypes.h> #include <inttypes.h>
#ifdef _WIN32
#include <conio.h>
#else
#include <termios.h> #include <termios.h>
#endif
int sp_fd; fdtype sp_fd;
void __attribute__((noreturn)) sp_die(char *msg) void __attribute__((noreturn)) sp_die(char *msg)
{ {
@ -40,6 +44,7 @@ void __attribute__((noreturn)) sp_die(char *msg)
exit(1); exit(1);
} }
#ifndef _WIN32
struct baudentry { struct baudentry {
int flag; int flag;
unsigned int baud; unsigned int baud;
@ -94,9 +99,36 @@ static const struct baudentry sp_baudtable[] = {
#endif #endif
{0, 0} /* Terminator */ {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; struct termios options;
int fd, i; int fd, i;
fd = open(dev, O_RDWR | O_NOCTTY | O_NDELAY); fd = open(dev, O_RDWR | O_NOCTTY | O_NDELAY);
@ -125,26 +157,39 @@ int sp_openserport(char *dev, unsigned int baud)
options.c_oflag &= ~OPOST; options.c_oflag &= ~OPOST;
tcsetattr(fd, TCSANOW, &options); tcsetattr(fd, TCSANOW, &options);
return fd; return fd;
#endif
} }
void sp_flush_incoming(void) void sp_flush_incoming(void)
{ {
#ifdef _WIN32
PurgeComm(sp_fd, PURGE_RXCLEAR);
#else
tcflush(sp_fd, TCIFLUSH); tcflush(sp_fd, TCIFLUSH);
#endif
return; return;
} }
int serialport_shutdown(void) int serialport_shutdown(void)
{ {
#ifdef _WIN32
CloseHandle(sp_fd);
#else
close(sp_fd); close(sp_fd);
#endif
return 0; return 0;
} }
int serialport_write(unsigned char *buf, unsigned int writecnt) int serialport_write(unsigned char *buf, unsigned int writecnt)
{ {
int tmp = 0; long tmp = 0;
while (writecnt > 0) { while (writecnt > 0) {
#ifdef _WIN32
WriteFile(sp_fd, buf, writecnt, &tmp, NULL);
#else
tmp = write(sp_fd, buf, writecnt); tmp = write(sp_fd, buf, writecnt);
#endif
if (tmp == -1) if (tmp == -1)
return 1; return 1;
if (!tmp) if (!tmp)
@ -158,10 +203,14 @@ int serialport_write(unsigned char *buf, unsigned int writecnt)
int serialport_read(unsigned char *buf, unsigned int readcnt) int serialport_read(unsigned char *buf, unsigned int readcnt)
{ {
int tmp = 0; long tmp = 0;
while (readcnt > 0) { while (readcnt > 0) {
#ifdef _WIN32
ReadFile(sp_fd, buf, readcnt, &tmp, NULL);
#else
tmp = read(sp_fd, buf, readcnt); tmp = read(sp_fd, buf, readcnt);
#endif
if (tmp == -1) if (tmp == -1)
return 1; return 1;
if (!tmp) if (!tmp)