diff --git a/BoardConfig.mk b/BoardConfig.mk index 1a34a78..be03779 100755 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -107,3 +107,5 @@ BOARD_VENDOR_QCOM_GPS_LOC_API_AMSS_VERSION := 3200 TARGET_PREBUILT_RECOVERY_KERNEL := device/htc/leo/recovery_kernel BOARD_USES_RECOVERY_CHARGEMODE := true + +TARGET_PROVIDES_INIT_RC := true diff --git a/init.htcleo.rc b/init.htcleo.rc new file mode 100644 index 0000000..ecc5756 --- /dev/null +++ b/init.htcleo.rc @@ -0,0 +1,142 @@ +on boot + mount debugfs /sys/kernel/debug /sys/kernel/debug + + mkdir /data/misc/wifi 0770 wifi wifi + mkdir /data/misc/wifi/sockets 0770 wifi wifi + mkdir /data/misc/dhcp 0770 dhcp dhcp + chown dhcp dhcp /data/misc/dhcp + + # bluetooth power up/down interface + chown bluetooth bluetooth /sys/class/rfkill/rfkill0/type + chown bluetooth bluetooth /sys/class/rfkill/rfkill0/state + chmod 0660 /sys/class/rfkill/rfkill0/state + + chown radio radio /sys/module/pm/parameters/idle_sleep_mode + + # Set error receiver + setprop ro.error.receiver.htc.apps com.android.updater + + # ruu + write /data/misc/screen_lock_status 0 + chown system system /data/misc/screen_lock_status + chmod 644 /data/misc/screen_lock_status + + # for wireless modem + chown system system /sys/module/serial/parameters/modem_enabled + chown system system /dev/ttyHSUSB0 + chown system system /dev/smd9 + chown media media /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor + + # Power Management + write /sys/devices/system/cpu/cpu0/cpufreq/ondemand/sampling_rate 40000 + + # Overwrite framework low memory killer minfree setting + write /sys/module/lowmemorykiller/parameters/minfree 3584,4096,6144,7168,7680,8192 + + # Enable low memory killer to check file pages + write /sys/module/lowmemorykiller/parameters/minfile 0,0,0,5120,5632,6144 + write /sys/module/lowmemorykiller/parameters/check_filepages + + +service hciattach /system/bin/brcm_patchram_plus --enable_hci\ + --baudrate 3000000 --patchram /etc/firmware/bcm4329.hcd /dev/ttyHS0 + user bluetooth + group bluetooth net_bt_admin + disabled + +#service btld /system/bin/logwrapper /system/bin/btld -lpm 1 -hb 3000000 +# user root +# group bluetooth net_bt_admin +# disabled +# oneshot + +# compass/accelerometer daemon +service akmd /system/bin/akmd + user compass + group compass misc input + +service wpa_supplicant /system/bin/wpa_supplicant \ + -Dwext -ieth0 -c/data/misc/wifi/wpa_supplicant.conf + #user wifi + #group wifi inet + socket wpa_eth0 dgram 660 wifi wifi + disabled + oneshot + +service dhcpcd_eth0 /system/bin/dhcpcd -ABKL + disabled + oneshot + +service iprenew_eth0 /system/bin/dhcpcd -n + disabled + oneshot + +# for USB internet sharing +service udhcpd /system/bin/udhcpd + disabled + oneshot + +#service netsharing_on /system/bin/netsharing net on +# disabled +# oneshot + +#service netsharing_off /system/bin/netsharing net off +# disabled +# oneshot + +#service netsharing_pass /system/bin/netsharing net_pass on +# disabled +# oneshot + +#service modem /system/xbin/wireless_modem +# user system +# group system +# disabled + +#service zchgd /system/bin/zchgd +# user root +# group root graphics +# oneshot + +service dumpstate /system/bin/dumpstate -s + socket dumpstate stream 0660 shell log + disabled + oneshot + +#on property:dev.bootcomplete=1 +# start bootcomplete + +#service bootcomplete /system/bin/bootcomplete +# user root +# group root +# disabled +# oneshot + +#service shutdown /system/bin/shutdown +# user root +# group root +# disabled +# oneshot + +#service ipd /system/bin/ipd +# socket ipd stream 666 root inet + +# Execute files in /etc/init.d before booting +service sysinit /system/bin/logwrapper /system/xbin/busybox run-parts /system/etc/init.d + disabled + oneshot + +#on property:service.modem.enable=1 +# start modem + +#on property:service.modem.enable=0 +# stop modem + +#service srv_ser2net /system/bin/ser2net -n +# disabled + +#on property:service.ser2net.enable=1 +# start srv_ser2net + +#on property:service.ser2net.enable=0 +# stop srv_ser2net diff --git a/init.rc b/init.rc new file mode 100644 index 0000000..38fac2f --- /dev/null +++ b/init.rc @@ -0,0 +1,451 @@ +on early-init + start ueventd + +on init + +sysclktz 0 + +loglevel 3 + +# setup the global environment + export PATH /sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin + export LD_LIBRARY_PATH /vendor/lib:/system/lib + export ANDROID_BOOTLOGO 1 + export ANDROID_CACHE /cache + export ANDROID_ROOT /system + export ANDROID_ASSETS /system/app + export ANDROID_DATA /data + export DOWNLOAD_CACHE /cache/download + export EXTERNAL_STORAGE /mnt/sdcard + export ASEC_MOUNTPOINT /mnt/asec + export LOOP_MOUNTPOINT /mnt/obb + export SD_EXT_DIRECTORY /sd-ext + export BOOTCLASSPATH /system/framework/core.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar:/system/framework/core-junit.jar + +# Backward compatibility + symlink /system/etc /etc + symlink /sys/kernel/debug /d + +# Right now vendor lives on the same filesystem as system, +# but someday that may change. + symlink /system/vendor /vendor + +# create mountpoints + mkdir /mnt 0775 root system + mkdir /mnt/sdcard 0000 system system + +# Create cgroup mount point for cpu accounting + mkdir /acct + mount cgroup none /acct cpuacct + mkdir /acct/uid + +# Backwards Compat - XXX: Going away in G* + symlink /mnt/sdcard /sdcard + + mkdir /system + mkdir /data 0771 system system + mkdir /cache 0771 system cache + mkdir /config 0500 root root + + # Directory for putting things only root should see. + mkdir /mnt/secure 0700 root root + + # Directory for staging bindmounts + mkdir /mnt/secure/staging 0700 root root + + # Directory-target for where the secure container + # imagefile directory will be bind-mounted + mkdir /mnt/secure/asec 0700 root root + + # Secure container public mount points. + mkdir /mnt/asec 0700 root system + mount tmpfs tmpfs /mnt/asec mode=0755,gid=1000 + + # Filesystem image public mount points. + mkdir /mnt/obb 0700 root system + mount tmpfs tmpfs /mnt/obb mode=0755,gid=1000 + + mkdir /sd-ext 0771 system system + + write /proc/sys/kernel/panic_on_oops 1 + write /proc/sys/kernel/hung_task_timeout_secs 0 + write /proc/cpu/alignment 4 + write /proc/sys/kernel/sched_latency_ns 10000000 + write /proc/sys/kernel/sched_wakeup_granularity_ns 2000000 + write /proc/sys/kernel/sched_compat_yield 1 + write /proc/sys/kernel/sched_child_runs_first 0 + +# Create cgroup mount points for process groups + mkdir /dev/cpuctl + mount cgroup none /dev/cpuctl cpu + chown system system /dev/cpuctl + chown system system /dev/cpuctl/tasks + chmod 0777 /dev/cpuctl/tasks + write /dev/cpuctl/cpu.shares 1024 + + mkdir /dev/cpuctl/fg_boost + chown system system /dev/cpuctl/fg_boost/tasks + chmod 0777 /dev/cpuctl/fg_boost/tasks + write /dev/cpuctl/fg_boost/cpu.shares 1024 + + mkdir /dev/cpuctl/bg_non_interactive + chown system system /dev/cpuctl/bg_non_interactive/tasks + chmod 0777 /dev/cpuctl/bg_non_interactive/tasks + # 5.0 % + write /dev/cpuctl/bg_non_interactive/cpu.shares 52 + +on fs +# mount mtd partitions + # Mount /system rw first to give the filesystem a chance to save a checkpoint + mount yaffs2 mtd@system /system + mount yaffs2 mtd@system /system ro remount + mount yaffs2 mtd@userdata /data nosuid nodev + + # leo specific for the purpose of RM and unlimited download space + if [ ! -d /data/cachemnt ] ; then + mkdir /data/cachemnt + chown system:system /data/cachemnt + chmod 777 /data/cachemnt + fi + + symlink /data/cachemnt /cache + chown system:system /data/cachemnt + +on post-fs + # once everything is setup, no need to modify / + mount rootfs rootfs / ro remount + + # We chown/chmod /data again so because mount is run as root + defaults + chown system system /data + chmod 0771 /data + + # Mount compressed filesystems + mount squashfs loop@/system/lib/modules/modules.sqf /system/lib/modules ro + mount squashfs loop@/system/xbin/xbin.sqf /system/xbin ro + + # Create dump dir and collect dumps. + # Do this before we mount cache so eventually we can use cache for + # storing dumps on platforms which do not have a dedicated dump partition. + + mkdir /data/dontpanic + chown root log /data/dontpanic + chmod 0750 /data/dontpanic + + # Collect apanic data, free resources and re-arm trigger + copy /proc/apanic_console /data/dontpanic/apanic_console + chown root log /data/dontpanic/apanic_console + chmod 0640 /data/dontpanic/apanic_console + + copy /proc/apanic_threads /data/dontpanic/apanic_threads + chown root log /data/dontpanic/apanic_threads + chmod 0640 /data/dontpanic/apanic_threads + + write /proc/apanic_console 1 + + # Same reason as /data above + chown system cache /cache + chmod 0771 /cache + + # This may have been created by the recovery system with odd permissions + chown system cache /cache/recovery + chmod 0770 /cache/recovery + + #change permissions on vmallocinfo so we can grab it from bugreports + chown root log /proc/vmallocinfo + chmod 0440 /proc/vmallocinfo + + #change permissions on kmsg & sysrq-trigger so bugreports can grab kthread stacks + chown root system /proc/kmsg + chmod 0440 /proc/kmsg + chown root system /proc/sysrq-trigger + chmod 0220 /proc/sysrq-trigger + +# create basic filesystem structure + mkdir /data/misc 01771 system misc + mkdir /data/misc/bluetoothd 0770 bluetooth bluetooth + mkdir /data/misc/bluetooth 0770 system system + mkdir /data/misc/keystore 0700 keystore keystore + mkdir /data/misc/vpn 0770 system system + mkdir /data/misc/systemkeys 0700 system system + mkdir /data/misc/vpn/profiles 0770 system system + # give system access to wpa_supplicant.conf for backup and restore + mkdir /data/misc/wifi 0770 wifi wifi + chmod 0770 /data/misc/wifi + chmod 0660 /data/misc/wifi/wpa_supplicant.conf + mkdir /data/local 0771 shell shell + mkdir /data/local/tmp 0771 shell shell + mkdir /data/local/download 0771 system cache + mkdir /data/data 0771 system system + mkdir /data/app-private 0771 system system + mkdir /data/app 0771 system system + mkdir /data/property 0700 root root + + mkdir /cache/download 0771 system cache + + # create dalvik-cache and double-check the perms + mkdir /data/dalvik-cache 0771 system system + chown system system /data/dalvik-cache + chmod 0771 /data/dalvik-cache + + mkdir /cache/dalvik-cache 0771 system system + chown system system /cache/dalvik-cache + chmod 0771 /cache/dalvik-cache + + # create the lost+found directories, so as to enforce our permissions + mkdir /data/lost+found 0770 + mkdir /cache/lost+found 0770 + + # double check the perms, in case lost+found already exists, and set owner + chown root root /data/lost+found + chmod 0770 /data/lost+found + chown root root /cache/lost+found + chmod 0770 /cache/lost+found + + # allow net_raw to have access to /dev/socket directory + chown root net_raw /dev/socket + chmod 0775 /dev/socket + + # allow system to modify cpufreq control files + chown root system /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor + chmod 0664 /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor + chown root system /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq + chmod 0664 /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq + chown root system /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq + chmod 0664 /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq + +on boot +# basic network init + ifup lo + hostname localhost + domainname localdomain + +# set RLIMIT_NICE to allow priorities from 19 to -20 + setrlimit 13 40 40 + +# Define the oom_adj values for the classes of processes that can be +# killed by the kernel. These are used in ActivityManagerService. + setprop ro.FOREGROUND_APP_ADJ 0 + setprop ro.VISIBLE_APP_ADJ 1 + setprop ro.PERCEPTIBLE_APP_ADJ 2 + setprop ro.HEAVY_WEIGHT_APP_ADJ 3 + setprop ro.SECONDARY_SERVER_ADJ 4 + setprop ro.BACKUP_APP_ADJ 5 + setprop ro.HOME_APP_ADJ 6 + setprop ro.HIDDEN_APP_MIN_ADJ 7 + setprop ro.EMPTY_APP_ADJ 15 + +# Define the memory thresholds at which the above process classes will +# be killed. These numbers are in pages (4k). + setprop ro.FOREGROUND_APP_MEM 2048 + setprop ro.VISIBLE_APP_MEM 3072 + setprop ro.PERCEPTIBLE_APP_MEM 4096 + setprop ro.HEAVY_WEIGHT_APP_MEM 4096 + setprop ro.SECONDARY_SERVER_MEM 6144 + setprop ro.BACKUP_APP_MEM 6144 + setprop ro.HOME_APP_MEM 6144 + setprop ro.HIDDEN_APP_MEM 7168 + setprop ro.EMPTY_APP_MEM 8192 + +# Write value must be consistent with the above properties. +# Note that the driver only supports 6 slots, so we have combined some of +# the classes into the same memory level; the associated processes of higher +# classes will still be killed first. + write /sys/module/lowmemorykiller/parameters/adj 0,1,2,4,7,15 + + write /proc/sys/vm/overcommit_memory 1 + write /proc/sys/vm/min_free_order_shift 4 + write /sys/module/lowmemorykiller/parameters/minfree 2048,3072,4096,6144,7168,8192 + + # Set init its forked children's oom_adj. + write /proc/1/oom_adj -16 + + # Tweak background writeout + write /proc/sys/vm/dirty_expire_centisecs 200 + write /proc/sys/vm/dirty_background_ratio 5 + + # Permissions for System Server and daemons. + chown radio system /sys/android_power/state + chown radio system /sys/android_power/request_state + chown radio system /sys/android_power/acquire_full_wake_lock + chown radio system /sys/android_power/acquire_partial_wake_lock + chown radio system /sys/android_power/release_wake_lock + chown radio system /sys/power/state + chown radio system /sys/power/wake_lock + chown radio system /sys/power/wake_unlock + chmod 0660 /sys/power/state + chmod 0660 /sys/power/wake_lock + chmod 0660 /sys/power/wake_unlock + chown system system /sys/class/timed_output/vibrator/enable + chown system system /sys/class/leds/keyboard-backlight/brightness + chown system system /sys/class/leds/lcd-backlight/brightness + chown system system /sys/class/leds/button-backlight/brightness + chown system system /sys/class/leds/jogball-backlight/brightness + chown system system /sys/class/leds/red/brightness + chown system system /sys/class/leds/green/brightness + chown system system /sys/class/leds/blue/brightness + chown system system /sys/class/leds/red/device/grpfreq + chown system system /sys/class/leds/red/device/grppwm + chown system system /sys/class/leds/red/device/blink + chown system system /sys/class/leds/red/brightness + chown system system /sys/class/leds/green/brightness + chown system system /sys/class/leds/blue/brightness + chown system system /sys/class/leds/red/device/grpfreq + chown system system /sys/class/leds/red/device/grppwm + chown system system /sys/class/leds/red/device/blink + chown system system /sys/class/timed_output/vibrator/enable + chown system system /sys/module/sco/parameters/disable_esco + chown system system /sys/kernel/ipv4/tcp_wmem_min + chown system system /sys/kernel/ipv4/tcp_wmem_def + chown system system /sys/kernel/ipv4/tcp_wmem_max + chown system system /sys/kernel/ipv4/tcp_rmem_min + chown system system /sys/kernel/ipv4/tcp_rmem_def + chown system system /sys/kernel/ipv4/tcp_rmem_max + chown root radio /proc/cmdline + +# Define TCP buffer sizes for various networks +# ReadMin, ReadInitial, ReadMax, WriteMin, WriteInitial, WriteMax, + setprop net.tcp.buffersize.default 4096,87380,110208,4096,16384,110208 + setprop net.tcp.buffersize.wifi 4095,87380,110208,4096,16384,110208 + setprop net.tcp.buffersize.umts 4094,87380,110208,4096,16384,110208 + setprop net.tcp.buffersize.edge 4093,26280,35040,4096,16384,35040 + setprop net.tcp.buffersize.gprs 4092,8760,11680,4096,8760,11680 + +# Include extra init file + import /system/etc/init.local.rc + +# Run sysinit + exec /system/bin/sysinit + + class_start default + +## Daemon processes to be run by init. +## +service ueventd /sbin/ueventd + critical + +service console /system/bin/sh + console + disabled + user shell + group log + +on property:ro.secure=0 + start console + +# adbd is controlled by the persist.service.adb.enable system property +service adbd /sbin/adbd + disabled + +# adbd on at boot in emulator +on property:ro.kernel.qemu=1 + start adbd + +on property:persist.service.adb.enable=1 + start adbd + +on property:persist.service.adb.enable=0 + stop adbd + +service servicemanager /system/bin/servicemanager + user system + critical + onrestart restart zygote + onrestart restart media + +service vold /system/bin/vold + socket vold stream 0660 root mount + ioprio be 2 + +service netd /system/bin/netd + socket netd stream 0660 root system + socket dnsproxyd stream 0660 root inet + +service debuggerd /system/bin/debuggerd + +service ril-daemon /system/bin/rild -l /system/lib/libhtc_ril_wrapper.so -- -d /dev/smd0 nand_init rmnet_mode + socket rild stream 660 root radio + socket rild-debug stream 660 radio system + user root + group radio cache inet misc audio sdcard_rw net_admin net_raw + +service zygote /system/bin/app_process -Xzygote /system/bin --zygote --start-system-server + socket zygote stream 666 + onrestart write /sys/android_power/request_state wake + onrestart write /sys/power/state on + onrestart restart media + onrestart restart netd + +service media /system/bin/mediaserver + user media + group system audio camera graphics inet net_bt net_bt_admin net_raw + ioprio rt 4 + +service bootanim /system/bin/bootanimation + user graphics + group graphics + disabled + oneshot + +service dbus /system/bin/dbus-daemon --system --nofork + socket dbus stream 660 bluetooth bluetooth + user bluetooth + group bluetooth net_bt_admin + +service bluetoothd /system/bin/bluetoothd -n + socket bluetooth stream 660 bluetooth bluetooth + socket dbus_bluetooth stream 660 bluetooth bluetooth + # init.rc does not yet support applying capabilities, so run as root and + # let bluetoothd drop uid to bluetooth with the right linux capabilities + group bluetooth net_bt_admin misc + disabled + +service hfag /system/bin/sdptool add --channel=10 HFAG + user bluetooth + group bluetooth net_bt_admin + disabled + oneshot + +service hsag /system/bin/sdptool add --channel=11 HSAG + user bluetooth + group bluetooth net_bt_admin + disabled + oneshot + +service opush /system/bin/sdptool add --channel=12 OPUSH + user bluetooth + group bluetooth net_bt_admin + disabled + oneshot + +service pbap /system/bin/sdptool add --channel=19 PBAP + user bluetooth + group bluetooth net_bt_admin + disabled + oneshot + +service installd /system/bin/installd + socket installd stream 600 system system + +service racoon /system/bin/racoon + socket racoon stream 600 system system + # racoon will setuid to vpn after getting necessary resources. + group net_admin + disabled + oneshot + +service mtpd /system/bin/mtpd + socket mtpd stream 600 system system + user vpn + group vpn net_admin net_raw + disabled + oneshot + +service keystore /system/bin/keystore /data/misc/keystore + user keystore + group keystore + socket keystore stream 666 + +service dumpstate /system/bin/dumpstate -s + socket dumpstate stream 0660 shell log + disabled + oneshot diff --git a/initrd.gz b/initrd.gz deleted file mode 100644 index fb17f50..0000000 Binary files a/initrd.gz and /dev/null differ diff --git a/leo.mk b/leo.mk index 38968ea..f4b2722 100755 --- a/leo.mk +++ b/leo.mk @@ -23,7 +23,8 @@ ## (1) First, the most specific values, i.e. the aspects that are specific to GSM PRODUCT_COPY_FILES += \ - device/htc/leo/init.leo.rc:root/init.leo.rc \ + device/htc/leo/init.htcleo.rc:root/init.htcleo.rc \ + device/htc/leo/init.rc:root/init.rc \ PRODUCT_PROPERTY_OVERRIDES += \ ro.sf.lcd_density=240 \ @@ -139,7 +140,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/htc/leo/kernel:boot/zImage \ - device/htc/leo/initrd.gz:boot/initrd.gz \ ifeq ($(TARGET_PREBUILT_KERNEL),) LOCAL_KERNEL := device/htc/leo/kernel diff --git a/libgps/leo-gps-rpc.c b/libgps/leo-gps-rpc.c index 3cd1c9d..100dd5b 100644 --- a/libgps/leo-gps-rpc.c +++ b/libgps/leo-gps-rpc.c @@ -40,7 +40,6 @@ #define ENABLE_NMEA 1 -#define MEASUREMENT_PRECISION 10.0f // in meters #define DUMP_DATA 0 #define GPS_DEBUG 0 @@ -96,6 +95,13 @@ static struct CLIENT *_clnt; static struct timeval timeout; static SVCXPRT *_svc; +static uint8_t CHECKED[4] = {0}; +static uint8_t XTRA_AUTO_DOWNLOAD_ENABLED = 0; +static uint8_t XTRA_DOWNLOAD_INTERVAL = 24; // hours +static uint8_t CLEANUP_ENABLED = 1; +static uint8_t SESSION_TIMEOUT = 2; // seconds +static uint8_t MEASUREMENT_PRECISION = 10; // meters + struct params { uint32_t *data; int length; @@ -691,7 +697,7 @@ void dispatch_pdsm_pd(uint32_t *data) { if (ntohl(data[75])) { fix.flags |= GPS_LOCATION_HAS_ACCURACY; float hdop = (float)ntohl(data[75]) / 10.0f / 2.0f; - fix.accuracy = hdop * MEASUREMENT_PRECISION; + fix.accuracy = hdop * (float)MEASUREMENT_PRECISION; } union { @@ -752,7 +758,6 @@ void dispatch_pdsm_ext(uint32_t *data) { no_fix++; if (no_fix < 2) return; - if (no_fix == UINT32_MAX) no_fix = 2; // avoid overflow ret.num_svs=ntohl(data[8]); D("%s() is called. num_svs=%d", __FUNCTION__, ret.num_svs); @@ -838,17 +843,16 @@ void dispatch(struct svc_req* a, registered_server* svc) { svc_sendreply(svc, xdr_int, &result); } -static uint8_t CHECKED[4] = {0}; -static uint8_t XTRA_AUTO_DOWNLOAD_ENABLED = 0; -static uint8_t XTRA_DOWNLOAD_INTERVAL = 24; // hours -static uint8_t CLEANUP_ENABLED = 1; -static uint8_t SESSION_TIMEOUT = 2; // seconds - uint8_t get_cleanup_value() { D("%s() is called: %d", __FUNCTION__, CLEANUP_ENABLED); return CLEANUP_ENABLED; } +uint8_t get_precision_value() { + D("%s() is called: %d", __FUNCTION__, MEASUREMENT_PRECISION); + return MEASUREMENT_PRECISION; +} + int parse_gps_conf() { FILE *file = fopen("/system/etc/gps.conf", "r"); if (!file) { @@ -860,6 +864,7 @@ int parse_gps_conf() { char *check_interval = "GPS1_XTRA_DOWNLOAD_INTERVAL"; char *check_cleanup = "GPS1_CLEANUP_ENABLED"; char *check_timeout = "GPS1_SESSION_TIMEOUT"; + char *check_precision = "GPS1_MEASUREMENT_PRECISION"; char *result; char str[256]; int i = -1; @@ -905,8 +910,23 @@ int parse_gps_conf() { CHECKED[3] = 1; } } + if (!CHECKED[4]) { + result = strstr(str, check_precision); + if (result != NULL) { + result = result+strlen(check_precision)+1; + i = atoi(result); + if (i>0 && i<16) + MEASUREMENT_PRECISION = i; + CHECKED[4] = 1; + } + } } fclose(file); + LOGD("%s() is called: GPS1_XTRA_AUTO_DOWNLOAD_ENABLED = %d", __FUNCTION__, XTRA_AUTO_DOWNLOAD_ENABLED); + LOGD("%s() is called: GPS1_XTRA_DOWNLOAD_INTERVAL = %d", __FUNCTION__, XTRA_DOWNLOAD_INTERVAL); + LOGD("%s() is called: GPS1_CLEANUP_ENABLED = %d", __FUNCTION__, CLEANUP_ENABLED); + LOGD("%s() is called: GPS1_SESSION_TIMEOUT = %d", __FUNCTION__, SESSION_TIMEOUT); + LOGD("%s() is called: GPS1_MEASUREMENT_PRECISION = %d", __FUNCTION__, MEASUREMENT_PRECISION); return 0; } @@ -952,6 +972,11 @@ int init_leo() pdsm_client_act(clnt, 4); if (!CHECKED[0]) { + if (use_nmea) + LOGD("%s() is called: %s version", __FUNCTION__, "NMEA"); + else + LOGD("%s() is called: %s version", __FUNCTION__, "RPC"); + parse_gps_conf(); if (XTRA_AUTO_DOWNLOAD_ENABLED) gps_xtra_set_auto_params(); diff --git a/libgps/leo-gps.c b/libgps/leo-gps.c index 12005ff..0dc191b 100644 --- a/libgps/leo-gps.c +++ b/libgps/leo-gps.c @@ -40,7 +40,6 @@ #define XTRA_BLOCK_SIZE 400 #define ENABLE_NMEA 1 -#define MEASUREMENT_PRECISION 10.0f // in meters #define DUMP_DATA 0 #define GPS_DEBUG 1 @@ -83,6 +82,7 @@ void update_gps_svstatus(GpsSvStatus *svstatus); void update_gps_nmea(GpsUtcTime timestamp, const char* nmea, int length); extern uint8_t get_cleanup_value(); +extern uint8_t get_precision_value(); /*****************************************************************/ /*****************************************************************/ @@ -445,7 +445,8 @@ nmea_reader_update_accuracy( NmeaReader* r, return -1; r->fix.flags |= GPS_LOCATION_HAS_ACCURACY; - r->fix.accuracy = (float)str2float(tok.p, tok.end) * MEASUREMENT_PRECISION; + float precision = (float)get_precision_value(); + r->fix.accuracy = (float)str2float(tok.p, tok.end) * precision; return 0; } @@ -835,7 +836,9 @@ void update_gps_status(GpsStatusValue value) { } void update_gps_svstatus(GpsSvStatus *svstatus) { +#if DUMP_DATA D("%s(): GpsSvStatus.num_svs=%d", __FUNCTION__, svstatus->num_svs); +#endif GpsState* state = _gps_state; //Should be made thread safe... if(state->callbacks.sv_status_cb) @@ -1125,8 +1128,16 @@ static int gps_xtra_inject_xtra_data(char* data, int length) { total_parts += 1; } + uint8_t part_no = total_parts % 10; + if (part_no > 0) + part_no = total_parts - part_no; + else + part_no = total_parts - 5; + len_injected = 0; // O bytes injected // XTRA injection starts with part 1 + D("gps_xtra_inject_xtra_data: inject part = %d/%d, len = %d\n", 1, total_parts, XTRA_BLOCK_SIZE); + D("gps_xtra_inject_xtra_data: ......"); for (part = 1; part <= total_parts; part++) { part_len = XTRA_BLOCK_SIZE; @@ -1136,7 +1147,8 @@ static int gps_xtra_inject_xtra_data(char* data, int length) { } xtra_data_ptr = data + len_injected; - D("gps_xtra_inject_xtra_data: inject part = %d/%d, len = %d\n", part, total_parts, part_len); + if (part > part_no) // reduce the number of the xtra debugging info + D("gps_xtra_inject_xtra_data: inject part = %d/%d, len = %d\n", part, total_parts, part_len); if (part < total_parts) { @@ -1306,11 +1318,10 @@ static int gps_set_position_mode(GpsPositionMode mode, int fix_frequency) { //We don't handle single shot requests atm... //So one every 1 seconds will it be. fix_frequency = 1; - } else if (fix_frequency > 8) { - //Ok, A9 will timeout with so high value. - //Set it to 8. - fix_frequency = 8; + } else if (fix_frequency > 1800) { //30mins + fix_frequency = 1800; } + // fix_frequency is only used by NMEA version s->fix_freq = fix_frequency; return 0; }