From f9d271cd64ffc450a544310352e4cad859e38065 Mon Sep 17 00:00:00 2001
From: Daniel Beer <dlbeer@gmail.com>
Date: Thu, 23 Aug 2012 14:27:27 +1200
Subject: [PATCH] tilib: fix calling convention for Cygwin.

WINAPI wasn't getting defined with gcc-3.
---
 drivers/tilib.c | 40 +++++++++++++++++++++-------------------
 util/dynload.h  |  6 +-----
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/drivers/tilib.c b/drivers/tilib.c
index e90f266..28f6683 100644
--- a/drivers/tilib.c
+++ b/drivers/tilib.c
@@ -28,8 +28,10 @@
 
 #if defined(__Windows__) || defined(__CYGWIN__)
 static const char tilib_filename[] = "MSP430.DLL";
+#define TIDLL __stdcall
 #else
 static const char tilib_filename[] = "libmsp430.so";
+#define TIDLL
 #endif
 
 struct tilib_device {
@@ -45,43 +47,43 @@ struct tilib_device {
 	char			uifPath[1024];
 
 	/* MSP430.h */
-	STATUS_T WINAPI (*MSP430_Initialize)(char *port, long *version);
-	STATUS_T WINAPI (*MSP430_VCC)(long voltage);
-	STATUS_T WINAPI (*MSP430_Configure)(long mode, long value);
-	STATUS_T WINAPI (*MSP430_OpenDevice)(char *Device, char *Password,
+	STATUS_T TIDLL (*MSP430_Initialize)(char *port, long *version);
+	STATUS_T TIDLL (*MSP430_VCC)(long voltage);
+	STATUS_T TIDLL (*MSP430_Configure)(long mode, long value);
+	STATUS_T TIDLL (*MSP430_OpenDevice)(char *Device, char *Password,
 					     long PwLength, long DeviceCode,
 					     long setId);
-	STATUS_T WINAPI (*MSP430_GetFoundDevice)(char *FoundDevice,
+	STATUS_T TIDLL (*MSP430_GetFoundDevice)(char *FoundDevice,
 						 long count);
-	STATUS_T WINAPI (*MSP430_Close)(long vccOff);
-	STATUS_T WINAPI (*MSP430_Memory)(long address, char *buffer,
+	STATUS_T TIDLL (*MSP430_Close)(long vccOff);
+	STATUS_T TIDLL (*MSP430_Memory)(long address, char *buffer,
 					 long count, long rw);
-	STATUS_T WINAPI (*MSP430_Reset)(long method, long execute,
+	STATUS_T TIDLL (*MSP430_Reset)(long method, long execute,
 					long releaseJTAG);
-	STATUS_T WINAPI (*MSP430_Erase)(long type, long address, long length);
-	STATUS_T WINAPI (*MSP430_Error_Number)(void);
-	const char *WINAPI (*MSP430_Error_String)(long errNumber);
+	STATUS_T TIDLL (*MSP430_Erase)(long type, long address, long length);
+	STATUS_T TIDLL (*MSP430_Error_Number)(void);
+	const char *TIDLL (*MSP430_Error_String)(long errNumber);
 
-	STATUS_T WINAPI (*MSP430_GetNumberOfUsbIfs)(long* number);
-	STATUS_T WINAPI (*MSP430_GetNameOfUsbIf)(long idx, char **name,
+	STATUS_T TIDLL (*MSP430_GetNumberOfUsbIfs)(long* number);
+	STATUS_T TIDLL (*MSP430_GetNameOfUsbIf)(long idx, char **name,
 						 long *status);
 
 	/* MSP430_Debug.h */
-	STATUS_T WINAPI (*MSP430_Registers)(long *registers, long mask,
+	STATUS_T TIDLL (*MSP430_Registers)(long *registers, long mask,
 					    long rw);
-	STATUS_T WINAPI (*MSP430_Run)(long mode, long releaseJTAG);
-	STATUS_T WINAPI (*MSP430_State)(long *state, long stop,
+	STATUS_T TIDLL (*MSP430_Run)(long mode, long releaseJTAG);
+	STATUS_T TIDLL (*MSP430_State)(long *state, long stop,
 					long *pCPUCycles);
 
 	/* MSP430_EEM.h */
-	STATUS_T WINAPI (*MSP430_EEM_Init)(DLL430_EVENTNOTIFY_FUNC callback,
+	STATUS_T TIDLL (*MSP430_EEM_Init)(DLL430_EVENTNOTIFY_FUNC callback,
 					   long clientHandle,
 					   MessageID_t *pMsgIdBuffer);
-	STATUS_T WINAPI (*MSP430_EEM_SetBreakpoint)(uint16_t *pwBpHandle,
+	STATUS_T TIDLL (*MSP430_EEM_SetBreakpoint)(uint16_t *pwBpHandle,
 						    BpParameter_t *pBpBuffer);
 
 	/* MSP430_FET.h */
-	STATUS_T WINAPI (*MSP430_FET_FwUpdate)(char* lpszFileName,
+	STATUS_T TIDLL (*MSP430_FET_FwUpdate)(char* lpszFileName,
 					   DLL430_FET_NOTIFY_FUNC callback,
 					   long clientHandle);
 
diff --git a/util/dynload.h b/util/dynload.h
index fb9e14e..2565469 100644
--- a/util/dynload.h
+++ b/util/dynload.h
@@ -27,11 +27,7 @@
 typedef HMODULE dynload_handle_t;
 #else /* __Windows__ */
 typedef void *dynload_handle_t;
-#endif
-
-#ifndef WINAPI
-#define WINAPI
-#endif
+#endif /* __Windows__ */
 
 dynload_handle_t dynload_open(const char *filename);
 void dynload_close(dynload_handle_t hnd);