Advertisement
uaa

V86DUDE for OpenBSD diff

uaa
Mar 10th, 2014
143
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 5.15 KB | None | 0 0
  1. diff -uNpr V86DUDE-master.orig/dmpcfg.h V86DUDE-master/dmpcfg.h
  2. --- V86DUDE-master.orig/dmpcfg.h Mon Dec 30 12:32:54 2013
  3. +++ V86DUDE-master/dmpcfg.h Tue Mar 11 05:21:02 2014
  4. @@ -36,8 +36,8 @@
  5. #define DMP_DOS_WATCOM
  6. #endif
  7.  
  8. -#if defined(linux) && defined(__GNUC__)
  9. - #define DMP_LINUX
  10. +#if defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__)
  11. + #define DMP_PCUNIX_GCC
  12. #endif
  13.  
  14. #if defined(_MSC_VER) //&& defined(_M_IX86)
  15. @@ -73,7 +73,7 @@
  16. #elif defined(DMP_DOS_DJGPP)
  17. //#define __dmp_inline(rtype) static __INLINE__ rtype
  18. #define __dmp_inline(rtype) static __inline__ rtype
  19. -#elif defined(DMP_LINUX_GCC)
  20. +#elif defined(DMP_PCUNIX_GCC)
  21. // note: GCC would always do inline-expansion for "static inline"
  22. #define __dmp_inline(rtype) static __inline__ rtype
  23. #elif defined(DMP_WINCE_MSVC) || defined(DMP_WIN32_MSVC)
  24. diff -uNpr V86DUDE-master.orig/openbsd/Makefile V86DUDE-master/openbsd/Makefile
  25. --- V86DUDE-master.orig/openbsd/Makefile Thu Jan 1 09:00:00 1970
  26. +++ V86DUDE-master/openbsd/Makefile Tue Mar 11 05:01:37 2014
  27. @@ -0,0 +1,8 @@
  28. +v86dude.exe : v86dude.o
  29. + gcc -o v86dude.exe v86dude.o -lstdc++
  30. +v86dude.o : ../v86dude.cpp
  31. + gcc -c ../v86dude.cpp -I../
  32. +
  33. +.PHONY : clean
  34. +clean :
  35. + -rm v86dude.o v86dude.exe
  36. diff -uNpr V86DUDE-master.orig/openbsd/readme.md V86DUDE-master/openbsd/readme.md
  37. --- V86DUDE-master.orig/openbsd/readme.md Thu Jan 1 09:00:00 1970
  38. +++ V86DUDE-master/openbsd/readme.md Tue Mar 11 05:32:22 2014
  39. @@ -0,0 +1,4 @@
  40. +OpenBSD
  41. +---------
  42. +
  43. +Simply use "make" to compile this program.
  44. diff -uNpr V86DUDE-master.orig/v86dude.cpp V86DUDE-master/v86dude.cpp
  45. --- V86DUDE-master.orig/v86dude.cpp Mon Dec 30 12:32:54 2013
  46. +++ V86DUDE-master/v86dude.cpp Tue Mar 11 05:25:19 2014
  47. @@ -8,7 +8,7 @@
  48. #define UART_INACTIVE (0x02)
  49. #define COM_TIMEOUT (8000L) // timeout = 8s
  50.  
  51. -#if defined (DMP_LINUX) || defined (__APPLE__)
  52. +#if defined (DMP_PCUNIX_GCC)
  53. #include <unistd.h>
  54. #include <termios.h>
  55. #include <fcntl.h>
  56. @@ -36,7 +36,7 @@ typedef struct usbcom {
  57. unsigned long timer_nowtime(void) { //in ms
  58. #if defined(DMP_WIN32_MSVC) || defined(DMP_WINCE_MSVC)
  59. return GetTickCount();
  60. -#elif defined(DMP_LINUX) || defined (__APPLE__)
  61. +#elif defined (DMP_PCUNIX_GCC)
  62. static bool usetimer = false;
  63. static unsigned long long inittime;
  64. struct tms cputime;
  65. @@ -63,7 +63,7 @@ void wait_uart_state(USBCOM_t* com, int state) {
  66. {
  67. if(timer_nowtime() > now) {printf("Wait COM port to timeout\n"); free((void*)com); exit(1);}
  68.  
  69. -#if defined (DMP_LINUX) || defined (__APPLE__)
  70. +#if defined (DMP_PCUNIX_GCC)
  71. com->fp = open(com->port, O_RDWR | O_NOCTTY | O_NONBLOCK);
  72. if(state == UART_INACTIVE)
  73. {if(com->fp < 0) break; else close(com->fp);}
  74. @@ -87,7 +87,7 @@ void wait_uart_state(USBCOM_t* com, int state) {
  75.  
  76. USBCOM_t* Init_UART(USBCOM_t* com) {
  77. wait_uart_state(com, UART_ACTIVE);
  78. -#if defined (DMP_LINUX) || defined (__APPLE__)
  79. +#if defined (DMP_PCUNIX_GCC)
  80. if (tcgetattr(com->fp, &(com->oldstate)) < 0)
  81. printf("fail to get termios settings\n");
  82.  
  83. @@ -150,7 +150,7 @@ USBCOM_t* Init_UART(USBCOM_t* com) {
  84.  
  85. void Close_UART(USBCOM_t* com) {
  86. if(com == NULL) return;
  87. -#if defined (DMP_LINUX) || defined (__APPLE__)
  88. +#if defined (DMP_PCUNIX_GCC)
  89. //tcsetattr(com->fp, TCSANOW, &(com->oldstate));
  90. close(com->fp);
  91. #elif defined (DMP_WIN32_MSVC)
  92. @@ -160,7 +160,7 @@ void Close_UART(USBCOM_t* com) {
  93.  
  94. static void softreset_86duino(USBCOM_t* com) {
  95. if(com == NULL) return;
  96. -#if defined (DMP_LINUX) || defined (__APPLE__)
  97. +#if defined (DMP_PCUNIX_GCC)
  98. //tcsetattr(com->fp, TCSANOW, &(com->oldstate));
  99. cfsetospeed(&(com->newstate), B1200);
  100. cfsetispeed(&(com->newstate), B1200);
  101. @@ -226,7 +226,7 @@ static bool send_package(USBCOM_t* com, unsigned char*
  102.  
  103. for (nowtime = timer_nowtime(); bsize2 > 0; buf += numbytes, bsize2 -= numbytes, bsize -= numbytes)
  104. {
  105. -#if defined (DMP_LINUX) || defined (__APPLE__)
  106. +#if defined (DMP_PCUNIX_GCC)
  107. if((numbytes = write(com->fp, buf, bsize2)) == -1) numbytes = 0;
  108. #elif defined (DMP_WIN32_MSVC)
  109. WriteFile(com->ur, buf, bsize2, (LPDWORD)&numbytes, NULL);
  110. @@ -246,7 +246,7 @@ static bool send_package(USBCOM_t* com, unsigned char*
  111. }
  112. }
  113.  
  114. -#if defined (DMP_LINUX) || defined (__APPLE__)
  115. +#if defined (DMP_PCUNIX_GCC)
  116. if(tcdrain(com->fp) < 0)
  117. {
  118. printf("tcdrain() fails\n");
  119. @@ -266,7 +266,7 @@ static bool send_package(USBCOM_t* com, unsigned char*
  120. static bool receive_package(USBCOM_t* com, unsigned char* buf, int bsize) {
  121. int numbytes = 0;
  122.  
  123. -#if defined (DMP_LINUX) || defined (__APPLE__)
  124. +#if defined (DMP_PCUNIX_GCC)
  125. unsigned long nowtime = timer_nowtime();
  126. while(bsize > 0)
  127. {
  128. @@ -619,7 +619,7 @@ int main(int argc, char* argv[]) {
  129.  
  130. Serial = (USBCOM_t*) malloc(sizeof(USBCOM_t));
  131. if(Serial == NULL) return 1;
  132. -#if defined (DMP_LINUX) || defined (__APPLE__)
  133. +#if defined (DMP_PCUNIX_GCC)
  134. Serial->port = argv[1];
  135. #elif defined (DMP_WIN32_MSVC)
  136. win_port[0] = '\\'; win_port[1] = '\\'; win_port[2] = '.'; win_port[3] = '\\';
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement