summaryrefslogtreecommitdiff
path: root/cross
diff options
context:
space:
mode:
authortv <tv@pkgsrc.org>2006-11-28 16:20:47 +0000
committertv <tv@pkgsrc.org>2006-11-28 16:20:47 +0000
commit901818d73e71e6e38737d5dc4aee0f1020e501fe (patch)
tree93209aca2d4d6ede48e143be6de7790716471be0 /cross
parentca8a7c2388660873f9a98256c2a393a9634b0d72 (diff)
downloadpkgsrc-901818d73e71e6e38737d5dc4aee0f1020e501fe.tar.gz
Interix has no nanosleep(3); use usleep(3) directly.
Diffstat (limited to 'cross')
-rw-r--r--cross/icdprog/distinfo4
-rw-r--r--cross/icdprog/patches/patch-ab26
2 files changed, 22 insertions, 8 deletions
diff --git a/cross/icdprog/distinfo b/cross/icdprog/distinfo
index 40b76c97c68..1c9941aa8dc 100644
--- a/cross/icdprog/distinfo
+++ b/cross/icdprog/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/12/23 18:21:40 joerg Exp $
+$NetBSD: distinfo,v 1.5 2006/11/28 16:20:47 tv Exp $
SHA1 (icdprog-0.3.tar.gz) = 4e8a8aac8845c531971b7a371d6dc5a9d460dbea
RMD160 (icdprog-0.3.tar.gz) = 5643ffd9687602ace01007f0514aeb5b372ca48e
Size (icdprog-0.3.tar.gz) = 8714 bytes
SHA1 (patch-aa) = 05e8cb5e69822ad854bd48bfcf0b24ea5b84ad22
-SHA1 (patch-ab) = 84f7cf3b8b5ae264b7380e3383596472244ac919
+SHA1 (patch-ab) = 1f16d2c06b3f0e0742f801cb2783d785ad735044
diff --git a/cross/icdprog/patches/patch-ab b/cross/icdprog/patches/patch-ab
index 6fe6a1418a2..201d8b33f36 100644
--- a/cross/icdprog/patches/patch-ab
+++ b/cross/icdprog/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2005/12/23 18:21:40 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2006/11/28 16:20:48 tv Exp $
---- icd.c.orig 2001-03-29 10:29:01.000000000 +0000
+--- icd.c.orig 2001-03-29 05:29:01.000000000 -0500
+++ icd.c
-@@ -12,6 +12,10 @@
+@@ -12,9 +12,16 @@
#define BAUDRATE B57600
@@ -13,7 +13,21 @@ $NetBSD: patch-ab,v 1.2 2005/12/23 18:21:40 joerg Exp $
int icd_fd; /* file descriptor for serial port */
int controller_type=-1;
-@@ -278,7 +282,7 @@ int icd_init(char *port)
++#ifdef __INTERIX
++#define udelay usleep
++#else
+ void udelay(unsigned usec)
+ {
+ /* wait for msec milliseconds or more ... */
+@@ -26,6 +33,7 @@ void udelay(unsigned usec)
+
+ nanosleep(&time,NULL);
+ }
++#endif
+
+ void dtr_set()
+ {
+@@ -278,7 +286,7 @@ int icd_init(char *port)
{
struct termios oldtio, newtio;
@@ -22,7 +36,7 @@ $NetBSD: patch-ab,v 1.2 2005/12/23 18:21:40 joerg Exp $
perror("Error opening device:");
return -1;
}
-@@ -286,10 +290,11 @@ int icd_init(char *port)
+@@ -286,10 +294,11 @@ int icd_init(char *port)
tcgetattr(icd_fd, &oldtio);
memset(&newtio,0, sizeof(newtio));
@@ -35,7 +49,7 @@ $NetBSD: patch-ab,v 1.2 2005/12/23 18:21:40 joerg Exp $
newtio.c_cc[VTIME] = 20;
newtio.c_cc[VMIN] = 0;
-@@ -297,6 +302,8 @@ int icd_init(char *port)
+@@ -297,6 +306,8 @@ int icd_init(char *port)
tcflush(icd_fd, TCIFLUSH);
tcsetattr(icd_fd, TCSANOW, &newtio);