Changeset 496


Ignore:
Timestamp:
Jun 8, 2006 11:43:42 PM (16 years ago)
Author:
ismangil
Message:

Initial work - debug symbian working, os_core still stubs

Location:
pjproject/branches/symbian
Files:
3 added
11 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/symbian/build/host-win32.mak

    r65 r496  
    11export HOST_MV := ren 
    2 export HOST_RM := if exist @@; del /F /Q @@ 
    3 export HOST_RMR := if exist @@; del /F /Q @@ 
    4 export HOST_RMDIR := if exist @@; rmdir @@ 
     2export HOST_RM := if exist @@; del /F /Q /S @@ 
     3export HOST_RMR := if exist @@; del /F /Q /S @@ 
     4export HOST_RMDIR := if exist @@; rmdir /S /Q @@ 
    55export HOST_MKDIR := if not exist @@; mkdir @@ 
    66export HOST_EXE := .exe 
  • pjproject/branches/symbian/build/os-symbian.mak

    r478 r496  
    1 export OS_CFLAGS   := $(CC_DEF)PJ_SYMBIAN=1 -I$(SYMBIAN_SDK_PATH)/include -I$(SYMBIAN_SDK_PATH)/include/libc -O 
     1export OS_CFLAGS   := $(CC_DEF)PJ_SYMBIAN=1 -I$(SYMBIAN_SDK_PATH)/include -I$(SYMBIAN_SDK_PATH)/include/libc -I../src/pjlib-test -O 
    22 
    33export OS_CXXFLAGS := 
  • pjproject/branches/symbian/pjlib/build/Makefile

    r431 r496  
    2828        types.o symbols.o 
    2929export PJLIB_CFLAGS += $(_CFLAGS) 
     30export PJLIB_CXXFLAGS += $(_CXXFLAGS) 
    3031 
    3132############################################################################### 
  • pjproject/branches/symbian/pjlib/build/os-symbian.mak

    r478 r496  
    88# to all operating systems should go in Makefile instead. 
    99# 
    10 export PJLIB_OBJS += 
     10export PJLIB_OBJS += addr_resolv_sock.o file_access_unistd.o \ 
     11                        file_io_ansi.o guid_simple.o \ 
     12                        log_writer_stdout.o os_core_symbian.o \ 
     13                        os_error_unix.o os_time_unix.o \ 
     14                        os_timestamp_common.o os_timestamp_posix.o \ 
     15                        pool_policy_malloc.o compat/string.o sock_bsd.o sock_select.o 
    1116 
    1217# 
     
    3136# operating system. 
    3237# 
    33 export TARGETS      =   pjlib pjlib-test.bas 
    34  
    35 pjlib-test.bas: pjlib-test 
    36         @echo [creating bas] 
     38export TARGETS      =   pjlib pjlib-test 
    3739 
    3840 
    3941 
    40  
    41  
  • pjproject/branches/symbian/pjlib/include/pj/compat/os_symbian.h

    r478 r496  
    4141#define PJ_HAS_STDLIB_H             1 
    4242#define PJ_HAS_STRING_H             1 
     43#define PJ_HAS_NO_SNPRINTF      1 
    4344#define PJ_HAS_SYS_IOCTL_H          1 
    4445#define PJ_HAS_SYS_SELECT_H         0 
     
    101102 */ 
    102103 
    103 /*#define NULL                      ((void*)0) 
    104 */ 
     104#define NULL                        ((void*)0) 
     105 
    105106/* 
    106107 * Override features. 
     
    134135#define PJ_THREAD_ALLOCATE_STACK        0 
    135136 
     137/* Missing socklen_t */ 
     138typedef unsigned int socklen_t; 
     139 
    136140#endif  /* __PJ_COMPAT_OS_SYMBIAN_H__ */ 
    137141 
  • pjproject/branches/symbian/pjlib/include/pj/config.h

    r478 r496  
    3232#elif defined(__GNUC__) 
    3333#  include <pj/compat/cc_gcc.h> 
     34#elif defined(__CW32__) 
     35#  include <pj/compat/cc_mwcc.h> 
    3436#else 
    3537#  error "Unknown compiler." 
  • pjproject/branches/symbian/pjlib/include/pj/sock.h

    r348 r496  
    6161 */ 
    6262extern const pj_uint16_t PJ_AF_UNIX;    /**< Unix domain socket.        */ 
    63 #define PJ_AF_LOCAL      PJ_AF_UNIX;    /**< POSIX name for AF_UNIX     */ 
     63extern const pj_uint16_t PJ_AF_LOCAL;    /**< Unix domain socket.       */ 
     64 
    6465extern const pj_uint16_t PJ_AF_INET;    /**< Internet IP protocol.      */ 
     66 
    6567extern const pj_uint16_t PJ_AF_INET6;   /**< IP version 6.              */ 
    6668extern const pj_uint16_t PJ_AF_PACKET;  /**< Packet family.             */ 
  • pjproject/branches/symbian/pjlib/src/pj/config.c

    r468 r496  
    11/* $Id$ */ 
    2 /*  
     2/* 
    33 * Copyright (C)2003-2006 Benny Prijono <benny@prijono.org> 
    44 * 
     
    1515 * You should have received a copy of the GNU General Public License 
    1616 * along with this program; if not, write to the Free Software 
    17  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  
     17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
    1818 */ 
    1919#include <pj/config.h> 
     
    3232    PJ_LOG(3, (id, " PJ_HAS_PENTIUM            : %d", PJ_HAS_PENTIUM)); 
    3333    PJ_LOG(3, (id, " PJ_OS_NAME                : %s", PJ_OS_NAME)); 
    34     PJ_LOG(3, (id, " PJ_CC_NAME/VER_(1,2,3)    : %s-%d.%d.%d", PJ_CC_NAME, 
    35                PJ_CC_VER_1, PJ_CC_VER_2, PJ_CC_VER_3)); 
    36     PJ_LOG(3, (id, " PJ_IS_(BIG/LITTLE)_ENDIAN : %s",  
     34/*    PJ_LOG(3, (id, " PJ_CC_NAME/VER_(1,2,3)    : %s-%d.%d.%d", PJ_CC_NAME, 
     35               PJ_CC_VER_1, PJ_CC_VER_2, PJ_CC_VER_3));*/ 
     36    PJ_LOG(3, (id, " PJ_IS_(BIG/LITTLE)_ENDIAN : %s", 
    3737               (PJ_IS_BIG_ENDIAN?"big-endian":"little-endian"))); 
    3838    PJ_LOG(3, (id, " PJ_HAS_INT64              : %d", PJ_HAS_INT64)); 
  • pjproject/branches/symbian/pjlib/src/pj/sock_bsd.c

    r433 r496  
    2929 * The values here are indexed based on pj_addr_family. 
    3030 */ 
     31#ifdef AF_UNIX 
    3132const pj_uint16_t PJ_AF_UNIX    = AF_UNIX; 
     33const pj_uint16_t PJ_AF_LOCAL   = AF_UNIX; 
     34#else 
     35const pj_uint16_t PJ_AF_UNIX    = 0xFFFF; 
     36#ifdef AF_LOCAL 
     37const pj_uint16_t PJ_AF_LOCAL   = AF_LOCAL; 
     38#else 
     39const pj_uint16_t PJ_AF_LOCAL   = 0xFFFF; 
     40#endif 
     41#endif 
    3242const pj_uint16_t PJ_AF_INET    = AF_INET; 
     43#ifdef AF_INET6 
    3344const pj_uint16_t PJ_AF_INET6   = AF_INET6; 
     45#else 
     46const pj_uint16_t PJ_AF_INET6   = 0xFFFF; 
     47#endif 
    3448#ifdef AF_PACKET 
    3549const pj_uint16_t PJ_AF_PACKET  = AF_PACKET; 
     
    5064const pj_uint16_t PJ_SOCK_DGRAM = SOCK_DGRAM; 
    5165const pj_uint16_t PJ_SOCK_RAW   = SOCK_RAW; 
     66#ifdef SOCK_RDM 
    5267const pj_uint16_t PJ_SOCK_RDM   = SOCK_RDM; 
     68#else 
     69const pj_uint16_t PJ_SOCK_RDM   = 0xFFFF; 
     70#endif 
    5371 
    5472/* 
     
    7896 
    7997/* optname values. */ 
     98#ifdef SO_TYPE 
    8099const pj_uint16_t PJ_SO_TYPE    = SO_TYPE; 
     100#else 
     101const pj_uint16_t PJ_SO_TYPE    = 0xFFFF; 
     102#endif 
    81103const pj_uint16_t PJ_SO_RCVBUF  = SO_RCVBUF; 
    82104const pj_uint16_t PJ_SO_SNDBUF  = SO_SNDBUF; 
     
    462484    PJ_ASSERT_RETURN(len, PJ_EINVAL); 
    463485 
     486#if !defined(PJ_SYMBIAN) && PJ_SYMBIAN == 0 
    464487    *len = sendto(sock, (const char*)buf, *len, flags,  
    465488                  (const struct sockaddr*)to, tolen); 
     489#else 
     490    *len = sendto(sock, (const char*)buf, *len, flags,  
     491                  (struct sockaddr*)to, tolen); 
     492#endif 
    466493 
    467494    if (*len < 0)  
     
    543570{ 
    544571    PJ_CHECK_STACK(); 
     572#if !defined(PJ_SYMBIAN) && PJ_SYMBIAN == 0 
    545573    if (setsockopt(sock, level, optname, (const char*)optval, optlen) != 0) 
     574#else 
     575    if (setsockopt(sock, level, optname, (void *)optval, optlen) != 0) 
     576#endif 
    546577        return PJ_RETURN_OS_ERROR(pj_get_native_netos_error()); 
    547578    else 
  • pjproject/branches/symbian/pjlib/src/pj/symbols.c

    r66 r496  
    249249PJ_EXPORT_SYMBOL(PJ_AF_UNIX) 
    250250PJ_EXPORT_SYMBOL(PJ_AF_INET) 
     251#ifdef AF_INET6 
    251252PJ_EXPORT_SYMBOL(PJ_AF_INET6) 
     253#endif 
    252254PJ_EXPORT_SYMBOL(PJ_AF_PACKET) 
    253255PJ_EXPORT_SYMBOL(PJ_AF_IRDA) 
  • pjproject/branches/symbian/pjlib/src/pjlib-test/test.h

    r433 r496  
    11/* $Id$ */ 
    2 /*  
     2/* 
    33 * Copyright (C)2003-2006 Benny Prijono <benny@prijono.org> 
    44 * 
     
    1515 * You should have received a copy of the GNU General Public License 
    1616 * along with this program; if not, write to the Free Software 
    17  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  
     17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
    1818 */ 
    1919#ifndef __PJLIB_TEST_H__ 
     
    4242#define INCLUDE_MUTEX_TEST          GROUP_OS 
    4343#define INCLUDE_SLEEP_TEST          GROUP_OS 
    44 #define INCLUDE_THREAD_TEST         GROUP_OS  
     44#define INCLUDE_THREAD_TEST         GROUP_OS 
    4545#define INCLUDE_SOCK_TEST           GROUP_NETWORK 
    4646#define INCLUDE_SOCK_PERF_TEST      GROUP_NETWORK 
     
    4949#define INCLUDE_TCP_IOQUEUE_TEST    GROUP_NETWORK 
    5050#define INCLUDE_IOQUEUE_PERF_TEST   GROUP_NETWORK 
    51 #define INCLUDE_IOQUEUE_UNREG_TEST  1   // GROUP_NETWORK 
     51#define INCLUDE_IOQUEUE_UNREG_TEST  0   // GROUP_NETWORK 
    5252#define INCLUDE_FILE_TEST           GROUP_FILE 
    5353 
Note: See TracChangeset for help on using the changeset viewer.