openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 07:02:34 +02:00
Code Issues Releases Wiki Activity

Move OS-dependent serial code from buspirate_spi.c to serial.c

Browse Source 
While at it, also rename a few functions to make it obvious
that they are generic and not specific to the Bus Pirate.

Corresponding to flashrom svn r830.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
This commit is contained in:
Carl-Daniel Hailfinger 2010-01-06 16:09:10 +00:00
parent cc1802db50
commit efa151eb10
3 changed files with 60 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
buspirate_spi.c
View File

@ -22,7 +22,6 @@
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
#include <fcntl.h>
#include "flash.h"
#include "spi.h"
@ -36,63 +35,12 @@ int buspirate_serialport_setup(char *dev)
sp_fd = sp_openserport(dev, 115200);
return 0;
}
int buspirate_serialport_shutdown(void)
{
close(sp_fd);
return 0;
}
int serialport_write(unsigned char *buf, unsigned int writecnt)
{
int tmp = 0;
while (tmp != writecnt) {
tmp = write(sp_fd, buf + tmp, writecnt - tmp);
if (tmp == -1)
return 1;
if (!tmp)
printf_debug("Empty write\n");
}
return 0;
}
int serialport_read(unsigned char *buf, unsigned int readcnt)
{
int tmp = 0;
while (tmp != readcnt) {
tmp = read(sp_fd, buf + tmp, readcnt - tmp);
if (tmp == -1)
return 1;
if (!tmp)
printf_debug("Empty read\n");
}
return 0;
}
int buspirate_discard_read(void)
{
int flags;
printf_debug("%s\n", __func__);
flags = fcntl(sp_fd, F_GETFL);
flags |= O_NONBLOCK;
fcntl(sp_fd, F_SETFL, flags);
sp_flush_incoming();
flags &= ~O_NONBLOCK;
fcntl(sp_fd, F_SETFL, flags);
return 0;
}
#else
#define buspirate_serialport_setup(...) 0
#define buspirate_serialport_shutdown(...) 0
#define serialport_shutdown(...) 0
#define serialport_write(...) 0
#define serialport_read(...) 0
#define buspirate_discard_read(...) 0
#define serialport_discard_read(...) 0
#endif
int buspirate_sendrecv(unsigned char *buf, unsigned int writecnt, unsigned int readcnt)
@ -196,7 +144,7 @@ int buspirate_spi_init(void)
if (ret)
return ret;
/* Read any response and discard it. */
ret = buspirate_discard_read();
ret = serialport_discard_read();
if (ret)
return ret;
}
@ -302,7 +250,7 @@ int buspirate_spi_shutdown(void)
return ret;
/* Shut down serial port communication */
ret = buspirate_serialport_shutdown();
ret = serialport_shutdown();
if (ret)
return ret;
printf_debug("Bus Pirate shutdown completed.\n");

4
flash.h
View File

@ -595,6 +595,10 @@ void sp_flush_incoming(void);
int sp_openserport(char *dev, unsigned int baud);
void __attribute__((noreturn)) sp_die(char *msg);
extern int sp_fd;
int serialport_shutdown(void);
int serialport_write(unsigned char *buf, unsigned int writecnt);
int serialport_read(unsigned char *buf, unsigned int readcnt);
int serialport_discard_read(void);
#include "chipdrivers.h"

52
serial.c
View File

@ -2,6 +2,7 @@
* This file is part of the flashrom project.
*
* Copyright (C) 2009 Urja Rannikko <urjaman@gmail.com>
* Copyright (C) 2009,2010 Carl-Daniel Hailfinger
*
* 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
@ -140,3 +141,54 @@ void sp_flush_incoming(void)
}
return;
}
int serialport_shutdown(void)
{
close(sp_fd);
return 0;
}
int serialport_write(unsigned char *buf, unsigned int writecnt)
{
int tmp = 0;
while (tmp != writecnt) {
tmp = write(sp_fd, buf + tmp, writecnt - tmp);
if (tmp == -1)
return 1;
if (!tmp)
printf_debug("Empty write\n");
}
return 0;
}
int serialport_read(unsigned char *buf, unsigned int readcnt)
{
int tmp = 0;
while (tmp != readcnt) {
tmp = read(sp_fd, buf + tmp, readcnt - tmp);
if (tmp == -1)
return 1;
if (!tmp)
printf_debug("Empty read\n");
}
return 0;
}
int serialport_discard_read(void)
{
int flags;
printf_debug("%s\n", __func__);
flags = fcntl(sp_fd, F_GETFL);
flags |= O_NONBLOCK;
fcntl(sp_fd, F_SETFL, flags);
sp_flush_incoming();
flags &= ~O_NONBLOCK;
fcntl(sp_fd, F_SETFL, flags);
return 0;
}