remove internal rawgps (#1252)

pull/1254/head
Willem Melching 5 years ago committed by GitHub
parent d08b56317f
commit ee7234485b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      release/files_common
  2. 2
      selfdrive/sensord/SConscript
  3. 13
      selfdrive/sensord/gpsd.cc
  4. 1184
      selfdrive/sensord/rawgps.cc
  5. 7
      selfdrive/sensord/rawgps.h

@ -288,8 +288,6 @@ selfdrive/loggerd/tests/*
selfdrive/sensord/SConscript selfdrive/sensord/SConscript
selfdrive/sensord/gpsd.cc selfdrive/sensord/gpsd.cc
selfdrive/sensord/libdiag.h selfdrive/sensord/libdiag.h
selfdrive/sensord/rawgps.cc
selfdrive/sensord/rawgps.h
selfdrive/sensord/sensors.cc selfdrive/sensord/sensors.cc
selfdrive/sensord/sensord selfdrive/sensord/sensord
selfdrive/sensord/gpsd selfdrive/sensord/gpsd

@ -2,4 +2,4 @@ Import('env', 'common', 'messaging')
env.Program('_sensord', 'sensors.cc', LIBS=['hardware', common, 'json', messaging, 'capnp', 'zmq', 'kj']) env.Program('_sensord', 'sensors.cc', LIBS=['hardware', common, 'json', messaging, 'capnp', 'zmq', 'kj'])
lenv = env.Clone() lenv = env.Clone()
lenv['LIBPATH'] += ['/system/vendor/lib64'] lenv['LIBPATH'] += ['/system/vendor/lib64']
lenv.Program('_gpsd', ['gpsd.cc', 'rawgps.cc'], LIBS=['hardware', common, 'diag', 'time_genoff', 'json', messaging, 'capnp', 'zmq', 'kj']) lenv.Program('_gpsd', ['gpsd.cc'], LIBS=['hardware', common, 'diag', 'time_genoff', 'json', messaging, 'capnp', 'zmq', 'kj'])

@ -24,8 +24,6 @@
#include "cereal/gen/cpp/log.capnp.h" #include "cereal/gen/cpp/log.capnp.h"
#include "rawgps.h"
volatile sig_atomic_t do_exit = 0; volatile sig_atomic_t do_exit = 0;
namespace { namespace {
@ -171,13 +169,6 @@ void gps_destroy() {
gGpsInterface->cleanup(); gGpsInterface->cleanup();
} }
int64_t arm_cntpct() {
int64_t v;
asm volatile("mrs %0, cntpct_el0" : "=r"(v));
return v;
}
} }
int main() { int main() {
@ -189,12 +180,8 @@ int main() {
gps_init(); gps_init();
rawgps_init();
while(!do_exit) pause(); while(!do_exit) pause();
rawgps_destroy();
gps_destroy(); gps_destroy();
return 0; return 0;

File diff suppressed because it is too large Load Diff

@ -1,7 +0,0 @@
#ifndef RAWGPS_H
#define RAWGPS_H
void rawgps_init();
void rawgps_destroy();
#endif
Loading…
Cancel
Save