Clean up remnants of Symbian support (creytiv#13)

Author: czarkoff

docs/README

@@ -130,7 +130,6 @@ Supported platforms:
 * FreeBSD
 * OpenBSD
 * NetBSD
-* Symbian OS (not supported)
 * Solaris
 * Windows
 * Apple Mac OS X and iOS

include/re_main.h

@@ -58,7 +58,6 @@ enum poll_method {
 	METHOD_POLL,
 	METHOD_SELECT,
 	METHOD_EPOLL,
-	METHOD_ACTSCHED,
 	METHOD_KQUEUE,
 	/* sep */
 	METHOD_MAX

include/re_mod.h

@@ -17,9 +17,6 @@
 #if defined (WIN32)
 #define MOD_PRE ""
 #define MOD_EXT ".dll"
-#elif defined (__SYMBIAN32__)
-#define MOD_PRE "mod_"
-#define MOD_EXT ".dll"
 #else
 #define MOD_PRE ""
 #define MOD_EXT ".so"

include/re_sys.h

@@ -15,32 +15,16 @@
  * Architecture
  */
 #ifndef ARCH
-#ifdef __SYMBIAN32__
-#if defined(__WINS__)
-#define ARCH "WINS"
-#elif defined(__MARM__)
-#define ARCH "ARM"
-#elif defined(__MARM_ARMI__)
-#define ARCH "ARMI"
-#elif defined(EKA2)
-#define ARCH "EKA2"
-#else
-#define ARCH "Symbian Arch"
-#endif
-#else
 #define ARCH "?"
 #endif
-#endif
 
 /**
  * @def OS
  *
  * Operating System
  */
 #ifndef OS
-#ifdef __SYMBIAN32__
-#define OS "Symbian"
-#elif defined (WIN32)
+#ifdef WIN32
 #define OS "win32"
 #else
 #define OS "?"

include/re_types.h

@@ -135,7 +135,7 @@ typedef bool _Bool;
 #endif
 
 /** Defines a soft breakpoint */
-#if (defined(__i386__) || defined(__x86_64__)) && !defined(__SYMBIAN32__)
+#if (defined(__i386__) || defined(__x86_64__))
 #define BREAKPOINT __asm__("int $0x03")
 #else
 #define BREAKPOINT

mk/win32/re.vcproj

@@ -316,9 +316,6 @@
 				<File
 					RelativePath="..\..\src\main\mod.mk">
 				</File>
-				<File
-					RelativePath="..\..\src\main\symbian">
-				</File>
 			</Filter>
 			<Filter
 				Name="mbuf"

src/main/init.c

@@ -21,9 +21,6 @@ int libre_init(void)
 {
 	int err;
 
-#ifdef HAVE_ACTSCHED
-	actsched_init();
-#endif
 	rand_init();
 
 #ifdef USE_OPENSSL

src/main/main.c

@@ -965,13 +965,6 @@ int re_main(re_signal_h *signalh)
 
 	re->polling = true;
 
-#ifdef HAVE_ACTSCHED
-	if (METHOD_ACTSCHED == re->method) {
-		err = actsched_start();
-		goto out;
-	}
-#endif
-
 	re_lock(re);
 	for (;;) {
 
@@ -1020,12 +1013,6 @@ void re_cancel(void)
 	struct re *re = re_get();
 
 	re->polling = false;
-
-#ifdef HAVE_ACTSCHED
-	if (METHOD_ACTSCHED == re->method) {
-		actsched_stop();
-	}
-#endif
 }
 
 
@@ -1091,10 +1078,6 @@ int poll_method_set(enum poll_method method)
 			return EINVAL;
 		break;
 #endif
-#ifdef HAVE_ACTSCHED
-	case METHOD_ACTSCHED:
-		break;
-#endif
 #ifdef HAVE_KQUEUE
 	case METHOD_KQUEUE:
 		break;

src/main/main.h

@@ -14,13 +14,6 @@ bool epoll_check(void);
 extern "C" {
 #endif
 
-#ifdef HAVE_ACTSCHED
-void actsched_init(void);
-int  actsched_start(void);
-void actsched_stop(void);
-void actsched_restart_timer(void);
-#endif
-
 #ifdef USE_OPENSSL
 int  openssl_init(void);
 void openssl_close(void);

src/main/method.c

@@ -13,7 +13,6 @@
 static const char str_poll[]   = "poll";     /**< POSIX.1-2001 poll       */
 static const char str_select[] = "select";   /**< POSIX.1-2001 select     */
 static const char str_epoll[]  = "epoll";    /**< Linux epoll             */
-static const char str_as[]     = "actsched"; /**< Symbian ActiveScheduler */
 static const char str_kqueue[] = "kqueue";
 
 
@@ -50,11 +49,6 @@ enum poll_method poll_method_best(void)
 		m = METHOD_SELECT;
 	}
 #endif
-#ifdef HAVE_ACTSCHED
-	if (METHOD_NULL == m) {
-		m = METHOD_ACTSCHED;
-	}
-#endif
 
 	return m;
 }
@@ -74,7 +68,6 @@ const char *poll_method_name(enum poll_method method)
 	case METHOD_POLL:      return str_poll;
 	case METHOD_SELECT:    return str_select;
 	case METHOD_EPOLL:     return str_epoll;
-	case METHOD_ACTSCHED:  return str_as;
 	case METHOD_KQUEUE:    return str_kqueue;
 	default:               return "???";
 	}
@@ -100,8 +93,6 @@ int poll_method_type(enum poll_method *method, const struct pl *name)
 		*method = METHOD_SELECT;
 	else if (0 == pl_strcasecmp(name, str_epoll))
 		*method = METHOD_EPOLL;
-	else if (0 == pl_strcasecmp(name, str_as))
-		*method = METHOD_ACTSCHED;
 	else if (0 == pl_strcasecmp(name, str_kqueue))
 		*method = METHOD_KQUEUE;
 	else

src/sys/sys.c

@@ -197,7 +197,7 @@ const char *sys_username(void)
 	login = getenv("LOGNAME");
 	if (!login)
 		login = getenv("USER");
-#if defined (HAVE_UNISTD_H) && !defined (__SYMBIAN32__)
+#ifdef HAVE_UNISTD_H
 	if (!login) {
 		login = getlogin();
 	}

src/tmr/tmr.c

@@ -271,15 +271,6 @@ void tmr_start(struct tmr *tmr, uint64_t delay, tmr_h *th, void *arg)
 			list_prepend(tmrl, &tmr->le, tmr);
 		}
 	}
-
-#ifdef HAVE_ACTSCHED
-	/* TODO: this is a hack. when a new timer is started we must reset
-	   the main sleeping timer in actsched.cpp */
-	{
-		extern void actsched_restart_timer(void);
-		actsched_restart_timer();
-	}
-#endif
 }