From 3f365fc06b67f8842b2e155349110f7c5659768d Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Sat, 26 May 2012 22:46:56 +0200 Subject: load_code: Get rid of win32 specific code in favor SDL_LoadFunction & friends APIs. Refactor native/hosted implementation seperation while at it (no wrappers starting with _ anymore). Change-Id: If68ae89700443bb3be483c1cace3d6739409560a --- firmware/export/load_code.h | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'firmware/export/load_code.h') diff --git a/firmware/export/load_code.h b/firmware/export/load_code.h index 6f8505aba7..cca577044e 100644 --- a/firmware/export/load_code.h +++ b/firmware/export/load_code.h @@ -25,10 +25,11 @@ #include "config.h" +extern void *lc_open(const char *filename, unsigned char *buf, size_t buf_size); + #if (CONFIG_PLATFORM & PLATFORM_NATIVE) #include "system.h" -extern void *lc_open(const char *filename, unsigned char *buf, size_t buf_size); /* header is always at the beginning of the blob, and handle actually points * to the start of the blob (the header is there) */ static inline void *lc_open_from_mem(void* addr, size_t blob_size) @@ -44,23 +45,10 @@ static inline void lc_close(void *handle) { (void)handle; } #elif (CONFIG_PLATFORM & PLATFORM_HOSTED) -/* don't call these directly for loading code - * they're to be wrapped by platform specific functions */ -#ifdef WIN32 -/* windows' LoadLibrary can only handle ucs2, no utf-8 */ -#define _lc_open_char wchar_t -#else -#define _lc_open_char char -#endif -extern void *_lc_open(const _lc_open_char *filename, unsigned char *buf, size_t buf_size); -extern void *_lc_get_header(void *handle); -extern void _lc_close(void *handle); - -extern void *lc_open(const char *filename, unsigned char *buf, size_t buf_size); -extern void *lc_open_from_mem(void *addr, size_t blob_size); +extern void *lc_open_from_mem(void* addr, size_t blob_size); extern void *lc_get_header(void *handle); extern void lc_close(void *handle); -extern const char* lc_last_error(void); + #endif /* this struct needs to be the first part of other headers -- cgit v1.2.3