diff options
| author | Johnathan Corgan | 2012-03-22 13:35:20 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-03-22 13:57:13 -0700 |
| commit | 81fba6490c6471e1db3bcc85d16ff2242f68fb43 (patch) | |
| tree | 89d54a97c23fdd5205c38947029e9d69e04f6db6 /gr-fcd/lib/fcd/fcd.h | |
| parent | e383cfe2674fa6682a1392af8d9b9f090af1aec5 (diff) | |
| download | gnuradio-81fba6490c6471e1db3bcc85d16ff2242f68fb43.tar.gz gnuradio-81fba6490c6471e1db3bcc85d16ff2242f68fb43.tar.bz2 gnuradio-81fba6490c6471e1db3bcc85d16ff2242f68fb43.zip | |
Implement conditionalized build for WIN32
Diffstat (limited to 'gr-fcd/lib/fcd/fcd.h')
| -rw-r--r-- | gr-fcd/lib/fcd/fcd.h | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/gr-fcd/lib/fcd/fcd.h b/gr-fcd/lib/fcd/fcd.h index 50983b473..7cfe9b7ed 100644 --- a/gr-fcd/lib/fcd/fcd.h +++ b/gr-fcd/lib/fcd/fcd.h @@ -23,6 +23,7 @@ #ifndef FCD_H #define FCD_H 1 +#include <fcd_api.h> #ifdef FCD #define EXTERN @@ -32,17 +33,8 @@ #define ASSIGN(x) #endif -#ifdef _WIN32 -#define FCD_API_EXPORT __declspec(dllexport) -#define FCD_API_CALL _stdcall -#else -#define FCD_API_EXPORT -#define FCD_API_CALL -#endif - #include <inttypes.h> - /** \brief FCD mode enumeration. */ typedef enum { FCD_MODE_NONE, /*!< No FCD detected. */ @@ -61,23 +53,23 @@ extern "C" { #endif /* Application functions */ -EXTERN FCD_API_EXPORT FCD_API_CALL FCD_MODE_ENUM fcdGetMode(void); -EXTERN FCD_API_EXPORT FCD_API_CALL FCD_MODE_ENUM fcdGetFwVerStr(char *str); -EXTERN FCD_API_EXPORT FCD_API_CALL FCD_MODE_ENUM fcdGetCaps(FCD_CAPS_STRUCT *fcd_caps); -EXTERN FCD_API_EXPORT FCD_API_CALL FCD_MODE_ENUM fcdGetCapsStr(char *caps_str); -EXTERN FCD_API_EXPORT FCD_API_CALL FCD_MODE_ENUM fcdAppReset(void); -EXTERN FCD_API_EXPORT FCD_API_CALL FCD_MODE_ENUM fcdAppSetFreqkHz(int nFreq); -EXTERN FCD_API_EXPORT FCD_API_CALL FCD_MODE_ENUM fcdAppSetFreq(int nFreq); +EXTERN FCD_API FCD_MODE_ENUM fcdGetMode(void); +EXTERN FCD_API FCD_MODE_ENUM fcdGetFwVerStr(char *str); +EXTERN FCD_API FCD_MODE_ENUM fcdGetCaps(FCD_CAPS_STRUCT *fcd_caps); +EXTERN FCD_API FCD_MODE_ENUM fcdGetCapsStr(char *caps_str); +EXTERN FCD_API FCD_MODE_ENUM fcdAppReset(void); +EXTERN FCD_API FCD_MODE_ENUM fcdAppSetFreqkHz(int nFreq); +EXTERN FCD_API FCD_MODE_ENUM fcdAppSetFreq(int nFreq); -EXTERN FCD_API_EXPORT FCD_API_CALL FCD_MODE_ENUM fcdAppSetParam(uint8_t u8Cmd, uint8_t *pu8Data, uint8_t u8len); -EXTERN FCD_API_EXPORT FCD_API_CALL FCD_MODE_ENUM fcdAppGetParam(uint8_t u8Cmd, uint8_t *pu8Data, uint8_t u8len); +EXTERN FCD_API FCD_MODE_ENUM fcdAppSetParam(uint8_t u8Cmd, uint8_t *pu8Data, uint8_t u8len); +EXTERN FCD_API FCD_MODE_ENUM fcdAppGetParam(uint8_t u8Cmd, uint8_t *pu8Data, uint8_t u8len); /* Bootloader functions */ -EXTERN FCD_API_EXPORT FCD_API_CALL FCD_MODE_ENUM fcdBlReset(void); -EXTERN FCD_API_EXPORT FCD_API_CALL FCD_MODE_ENUM fcdBlErase(void); -EXTERN FCD_API_EXPORT FCD_API_CALL FCD_MODE_ENUM fcdBlWriteFirmware(char *pc, int64_t n64Size); -EXTERN FCD_API_EXPORT FCD_API_CALL FCD_MODE_ENUM fcdBlVerifyFirmware(char *pc, int64_t n64Size); +EXTERN FCD_API FCD_MODE_ENUM fcdBlReset(void); +EXTERN FCD_API FCD_MODE_ENUM fcdBlErase(void); +EXTERN FCD_API FCD_MODE_ENUM fcdBlWriteFirmware(char *pc, int64_t n64Size); +EXTERN FCD_API FCD_MODE_ENUM fcdBlVerifyFirmware(char *pc, int64_t n64Size); #ifdef __cplusplus |