|
Message
From: cvs at opencores.org<cvs@o...>
Date: Thu Feb 22 20:01:14 CET 2007
Subject: [cvs-checkins] MODIFIED: usb_dongle_fpga ...
Date: 00/07/02 22:20:01 Modified: usb_dongle_fpga/sw/Uspp SerialPort_linux.py SerialPort_win.py Log: Made failing on port open retry Revision Changes Path 1.2 usb_dongle_fpga/sw/Uspp/SerialPort_linux.py http://www.opencores.org/cvsweb.shtml/usb_dongle_fpga/sw/Uspp/SerialPort_linux.py.diff?r1=1.1&r2=1.2 (In the diff below, changes in quantity of whitespace are not shown.) Index: SerialPort_linux.py =================================================================== RCS file: /cvsroot/nuubik/usb_dongle_fpga/sw/Uspp/SerialPort_linux.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- SerialPort_linux.py 7 Dec 2006 10:46:48 -0000 1.1 +++ SerialPort_linux.py 22 Feb 2007 19:01:13 -0000 1.2 @@ -119,10 +119,21 @@ self.__devName, self.__timeout, self.__speed=dev, timeout, speed self.__mode=mode self.__params=params + self.__speed = 0 + self.__reopen = 0 + while 1: try: self.__handle=os.open(dev, os.O_RDWR) + break + except: - raise SerialPortException('Unable to open port') + n=0 + while (n < 2000000): + n += 1; + self.__reopen = self.__reopen + 1 + if self.__reopen > 32: + print "Port does not exist..." + sys.exit() self.__configure() @@ -132,9 +143,8 @@ To close the serial port we have to do explicity: del s (where s is an instance of SerialPort) """ - + if self.__speed: tcsetattr(self.__handle, TCSANOW, self.__oldmode) - try: os.close(self.__handle) except IOError: 1.2 usb_dongle_fpga/sw/Uspp/SerialPort_win.py http://www.opencores.org/cvsweb.shtml/usb_dongle_fpga/sw/Uspp/SerialPort_win.py.diff?r1=1.1&r2=1.2 (In the diff below, changes in quantity of whitespace are not shown.) Index: SerialPort_win.py =================================================================== RCS file: /cvsroot/nuubik/usb_dongle_fpga/sw/Uspp/SerialPort_win.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- SerialPort_win.py 7 Dec 2006 10:46:48 -0000 1.1 +++ SerialPort_win.py 22 Feb 2007 19:01:13 -0000 1.2 @@ -109,6 +109,9 @@ self.__devName, self.__timeout, self.__speed=dev, timeout, speed self.__mode=mode self.__params=params + self.__speed = 0 + self.__reopen = 0 + while 1: try: self.__handle=CreateFile (dev, win32con.GENERIC_READ|win32con.GENERIC_WRITE, @@ -117,10 +120,16 @@ win32con.OPEN_EXISTING, win32con.FILE_ATTRIBUTE_NORMAL, None) + break except: - raise SerialPortException('Unable to open port') - + n=0 + while (n < 2000000): + n += 1; + self.__reopen = self.__reopen + 1 + if self.__reopen > 32: + print "Port does not exist..." + sys.exit() self.__configure() def __del__(self):
@@ -129,6 +138,7 @@
To close the serial port we have to do explicity: del s
(where s is an instance of SerialPort)
"""
+ if self.__speed:
try:
CloseHandle(self.__handle)
except:
|
 |