From 495f5ff51bd4a37b36aacb72e6c9ca9648dff483 Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Sun, 18 Sep 2016 17:11:37 +0200 Subject: [PATCH] remove symbian --- src/dns/ns.c | 9 -- src/dns/symbian/srv.cpp | 85 ----------------- src/lock/symbian/rmutex.cpp | 87 ----------------- src/main/main.c | 2 - src/main/symbian/actsched.cpp | 169 ---------------------------------- src/mod/symbian/rlib.cpp | 67 -------------- src/net/if.c | 2 - src/net/sockopt.c | 2 - src/sys/fs.c | 8 -- src/sys/symbian/sleep.cpp | 18 ---- src/sys/sys.c | 4 +- src/tcp/tcp.c | 4 - src/udp/udp.c | 4 - 13 files changed, 1 insertion(+), 460 deletions(-) delete mode 100644 src/dns/symbian/srv.cpp delete mode 100644 src/lock/symbian/rmutex.cpp delete mode 100644 src/main/symbian/actsched.cpp delete mode 100644 src/mod/symbian/rlib.cpp delete mode 100644 src/sys/symbian/sleep.cpp diff --git a/src/dns/ns.c b/src/dns/ns.c index c2e1b01..1284e6c 100644 --- a/src/dns/ns.c +++ b/src/dns/ns.c @@ -21,11 +21,6 @@ #include -#ifdef __SYMBIAN32__ -extern int get_symbiandns(struct sa *nsv, uint32_t *n); -#endif - - static int parse_resolv_conf(char *domain, size_t dsize, struct sa *srvv, uint32_t *n) { @@ -147,10 +142,6 @@ int dns_srv_get(char *domain, size_t dsize, struct sa *srvv, uint32_t *n) err = get_windns(domain, dsize, srvv, n); #endif -#ifdef __SYMBIAN32__ - err = get_symbiandns(srvv, n); -#endif - #ifdef __ANDROID__ err = get_android_dns(srvv, n); #endif diff --git a/src/dns/symbian/srv.cpp b/src/dns/symbian/srv.cpp deleted file mode 100644 index 5283828..0000000 --- a/src/dns/symbian/srv.cpp +++ /dev/null @@ -1,85 +0,0 @@ -/** - * @file srv.cpp Get DNS Server IP code for Symbian OS - * - * Copyright (C) 2010 Creytiv.com - */ -#include -#include - - -extern "C" { -#include -#include -#include -#include -#include -#include -extern int get_symbiandns(struct sa *nsv, uint32_t *n); -} - - -int get_symbiandns(struct sa *nsv, uint32_t *n) -{ - RSocketServ serv; - RSocket sock; - uint32_t i = 0; - int ret; - - if (!nsv || !n || !*n) - return EINVAL; - - ret = serv.Connect(); - if (KErrNone != ret) - return kerr2errno(ret); - ret = sock.Open(serv, KAfInet, KSockStream, KProtocolInetTcp); - if (KErrNone != ret) { - serv.Close(); - return kerr2errno(ret); - } - sock.SetOpt(KSoInetEnumInterfaces, KSolInetIfCtrl); - - TPckgBuf ifinfo; - while (sock.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, - ifinfo)==KErrNone) { - struct sa sa; - - if (EIfUp != ifinfo().iState) - continue; - - sa_set_in(&sa, ifinfo().iAddress.Address(), 0); - - if (sa_is_loopback(&sa)) - continue; - - if (sa_is_linklocal(&sa)) - continue; - - if (ifinfo().iNameSer1.Address()) { - sa_set_in(&nsv[i], ifinfo().iNameSer1.Address(), - DNS_PORT); - ++i; - } - - if (i >= *n) - break; - - if (ifinfo().iNameSer2.Address()) { - sa_set_in(&nsv[i], ifinfo().iNameSer2.Address(), - DNS_PORT); - ++i; - } - - if (i >= *n) - break; - } - - sock.Close(); - serv.Close(); - - if (i == 0) - return ENOENT; - - *n = i; - - return 0; -} diff --git a/src/lock/symbian/rmutex.cpp b/src/lock/symbian/rmutex.cpp deleted file mode 100644 index 1f7f595..0000000 --- a/src/lock/symbian/rmutex.cpp +++ /dev/null @@ -1,87 +0,0 @@ -/** - * @file rmutex.cpp Symbian RMutex locking - * - * Copyright (C) 2010 Creytiv.com - */ -#include - -extern "C" { -#include -#include -#include -} - - -struct lock { - RMutex m; -}; - - -static void lock_destructor(void *data) -{ - struct lock *l = (struct lock *)data; - - l->m.Close(); -} - - -int lock_alloc(struct lock **lp) -{ - struct lock *l; - - if (!lp) - return EINVAL; - - l = (struct lock *)mem_zalloc(sizeof(*l), lock_destructor); - if (!l) - return ENOMEM; - - const TInt ret = l->m.CreateLocal(); - if (KErrNone != ret) { - return EINVAL; - } - - *lp = l; - return 0; -} - - -void lock_read_get(struct lock *l) -{ - if (!l) - return; - - l->m.Wait(); -} - - -void lock_write_get(struct lock *l) -{ - if (!l) - return; - - l->m.Wait(); -} - - -int lock_read_try(struct lock *l) -{ - (void)l; - return ENOSYS; -} - - -int lock_write_try(struct lock *l) -{ - (void)l; - return ENOSYS; -} - - -void lock_rel(struct lock *l) -{ - if (!l) - return; - - l->m.Signal(); -} diff --git a/src/main/main.c b/src/main/main.c index 81fbffb..fd6e0ea 100644 --- a/src/main/main.c +++ b/src/main/main.c @@ -14,8 +14,6 @@ #endif #ifdef WIN32 #include -#elif defined(__SYMBIAN32__) -#define bzero(b,len) memset(b,0,len) #endif #ifdef HAVE_SIGNAL #include diff --git a/src/main/symbian/actsched.cpp b/src/main/symbian/actsched.cpp deleted file mode 100644 index 041c747..0000000 --- a/src/main/symbian/actsched.cpp +++ /dev/null @@ -1,169 +0,0 @@ -/** - * @file actsched.cpp Symbian Active Scheduler - * - * Copyright (C) 2010 Creytiv.com - */ -#include -#include -#include "../main.h" - -extern "C" { -#include -#include -#include - -#define DEBUG_MODULE "actsched" -#define DEBUG_LEVEL 5 -#include - -extern struct list *tmrl_get(void); -} - - -class CMyTimer : public CTimer -{ -public: - static CMyTimer *NewL(TInt aPriority); - void Start(); - -protected: - CMyTimer(TInt aPriority); - virtual void RunL(); -}; - -static CMyTimer *t; -static CActiveScheduler as; -static bool inited = false; -static bool running = false; - - -CMyTimer *CMyTimer::NewL(TInt aPriority) -{ - CMyTimer *t = new CMyTimer(aPriority); - t->ConstructL(); - return t; -} - - -CMyTimer::CMyTimer(TInt aPriority) - :CTimer(aPriority) -{ - CActiveScheduler::Add(this); -} - - -void CMyTimer::Start() -{ - Cancel(); - - /* - CTimer range is +-2147483647, which is +-35 minutes, 47 seconds. - */ - uint64_t to = tmr_next_timeout(tmrl_get()); - if (to) { - if (to >= 2147482) { - to = 2147482; - } - After(1000*to); - } - else { - DEBUG_INFO("idle.. no timers\n"); - } -} - - -void CMyTimer::RunL() -{ - tmr_poll(tmrl_get()); - - if (!t) - return; - - Start(); -} - - -void actsched_init(void) -{ - DEBUG_INFO("actsched init (inited=%d)\n", inited); - - if (inited) - return; - - inited = true; - - /* Setup the Active Scheduler */ - if (CActiveScheduler::Current()) { - DEBUG_INFO("Active Scheduler already installed\n"); - } - else { - DEBUG_INFO("Installing new Active Scheduler\n"); - CActiveScheduler::Install(&as); - } -} - - -int actsched_start(void) -{ - actsched_init(); - - DEBUG_INFO("actsched start: (running=%d)\n", running); - - if (running) { - DEBUG_WARNING("actsched start: already running\n"); - return EALREADY; - } - - running = true; - - if (!t) { - t = CMyTimer::NewL(0); - t->After(1000); - } - - /* Main loop */ - if (CActiveScheduler::Current() == &as) { - DEBUG_INFO("Starting own Active Scheduler\n"); - CActiveScheduler::Start(); /* loop here */ - running = false; - } - - return 0; -} - - -void actsched_stop(void) -{ - DEBUG_INFO("actsched stop (inited=%d)\n", inited); - - if (!running) - return; - - /* Must be called from same thread as ::Start() */ - if (CActiveScheduler::Current() == &as) { - DEBUG_INFO("Stopping own Active Scheduler\n"); - CActiveScheduler::Stop(); - } - - if (t) { - delete t; - t = NULL; - } - - inited = false; - running = false; -} - - -/* - * Called from tmr_start() when a new timer is added. - * - * TODO: this is a hack; consider moving it to tmr.c - */ -void actsched_restart_timer(void) -{ - if (!t) - return; - - t->Start(); -} diff --git a/src/mod/symbian/rlib.cpp b/src/mod/symbian/rlib.cpp deleted file mode 100644 index d3ab5ce..0000000 --- a/src/mod/symbian/rlib.cpp +++ /dev/null @@ -1,67 +0,0 @@ -/** - * @file rlib.cpp Dynamic library loading for Symbian - * - * Copyright (C) 2010 Creytiv.com - */ -#include -#include -#include "../mod_internal.h" - - -extern "C" { -#define DEBUG_MODULE "rlib" -#define DEBUG_LEVEL 5 -#include -} - - -void *_mod_open(const char *name) -{ - TBuf<128> buf; - TBuf8<128> buf8; - buf8.Copy((unsigned char *)name); - buf.Copy(buf8); - - DEBUG_INFO("rlib open (%s)\n", name); - - RLibrary *lib = new RLibrary; - if (!lib) { - DEBUG_WARNING("open: could not allocate RLibrary (%s)\n", - name); - return NULL; - } - TInt err = lib->Load(buf); - if (KErrNone != err) { - DEBUG_WARNING("open: Load failed with err=%d (%s)\n", err, - name); - delete lib; - return NULL; - } - - return lib; -} - - -void *_mod_sym(void *h, const char *symbol) -{ - RLibrary *lib = (RLibrary *)h; - - (void)symbol; - - /* NOTE: symbol lookup is done by ordinal. - */ - TLibraryFunction func = lib->Lookup(1); - TInt ret = func(); - - DEBUG_INFO("rlib sym: ret=0x%08x\n", func, ret); - - return (void *)ret; -} - - -void _mod_close(void *h) -{ - RLibrary *lib = (RLibrary *)h; - - delete lib; -} diff --git a/src/net/if.c b/src/net/if.c index 3bbde5f..88e5876 100644 --- a/src/net/if.c +++ b/src/net/if.c @@ -138,7 +138,6 @@ int net_if_getaddr(const char *ifname, int af, struct sa *ip) } -#ifndef __SYMBIAN32__ static bool if_debug_handler(const char *ifname, const struct sa *sa, void *arg) { @@ -174,7 +173,6 @@ int net_if_debug(struct re_printf *pf, void *unused) return err; } -#endif static bool linklocal_handler(const char *ifname, const struct sa *sa, diff --git a/src/net/sockopt.c b/src/net/sockopt.c index 247580c..2385a69 100644 --- a/src/net/sockopt.c +++ b/src/net/sockopt.c @@ -20,8 +20,6 @@ /** Platform independent buffer type cast */ #ifdef WIN32 #define BUF_CAST (char *) -#elif defined (__SYMBIAN32__) -#define BUF_CAST (void *) #else #define BUF_CAST #endif diff --git a/src/sys/fs.c b/src/sys/fs.c index e357bcc..c9bc805 100644 --- a/src/sys/fs.c +++ b/src/sys/fs.c @@ -83,14 +83,6 @@ int fs_gethome(char *path, size_t sz) return 0; -#elif defined(__SYMBIAN32__) - if (!path || !sz) - return EINVAL; - - str_ncpy(path, "c:\\Data", sz); - - return 0; - #elif defined(HAVE_PWD_H) const char *loginname; struct passwd *pw; diff --git a/src/sys/symbian/sleep.cpp b/src/sys/symbian/sleep.cpp deleted file mode 100644 index 4fd20bf..0000000 --- a/src/sys/symbian/sleep.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/** - * @file sleep.cpp System sleep for Symbian - * - * Copyright (C) 2010 Creytiv.com - */ - -#include - -extern "C" { -#include -#include -} - - -void sys_usleep(unsigned int us) -{ - User::After(us); -} diff --git a/src/sys/sys.c b/src/sys/sys.c index 0989dbb..687aa9f 100644 --- a/src/sys/sys.c +++ b/src/sys/sys.c @@ -98,9 +98,7 @@ int sys_kernel_get(struct re_printf *pf, void *unused) (void)unused; -#if defined (__SYMBIAN32__) - str = "Symbian OS"; -#elif defined(WIN32) +#if defined(WIN32) str = "Win32"; #else str = "?"; diff --git a/src/tcp/tcp.c b/src/tcp/tcp.c index a6367eb..68dc2d6 100644 --- a/src/tcp/tcp.c +++ b/src/tcp/tcp.c @@ -42,10 +42,6 @@ #define SOK_CAST (int) #define SIZ_CAST (int) #define close closesocket -#elif defined (__SYMBIAN32__) -#define BUF_CAST (void *) -#define SOK_CAST -#define SIZ_CAST #else #define BUF_CAST #define SOK_CAST diff --git a/src/udp/udp.c b/src/udp/udp.c index 38289d2..c1afee5 100644 --- a/src/udp/udp.c +++ b/src/udp/udp.c @@ -44,10 +44,6 @@ #define SOK_CAST (int) #define SIZ_CAST (int) #define close closesocket -#elif defined (__SYMBIAN32__) -#define BUF_CAST (void *) -#define SOK_CAST -#define SIZ_CAST #else #define BUF_CAST #define SOK_CAST