diff options
| author | Xin Li <delphij@google.com> | 2021-08-14 06:30:58 +0000 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2021-08-14 06:30:58 +0000 |
| commit | e05907e3677d2e495a5030c3e66df0b8f96ece41 (patch) | |
| tree | 0ffef1012dfebf8af3acf0ad88dc9aadd8e5a3fe | |
| parent | 72f85e963954a9c99d3cfe3bff4ae01731a68e1b (diff) | |
| parent | 8d468c1755e3c34186c5989b9a2fab54d9da18d6 (diff) | |
| download | sound_trigger_hal-e05907e3677d2e495a5030c3e66df0b8f96ece41.tar.gz | |
Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961
Merged-In: Iac6689ca06cb524133d0f880b61b56ea21df5261
Change-Id: I3f9ffb1d2b3f37a61c69c8e34ccc0b8fc9dc9668
| -rw-r--r-- | sound_trigger_hw_iaxxx.c | 3 | ||||
| -rw-r--r-- | tests/oslo_config_test.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sound_trigger_hw_iaxxx.c b/sound_trigger_hw_iaxxx.c index e3d34ff..5225091 100644 --- a/sound_trigger_hw_iaxxx.c +++ b/sound_trigger_hw_iaxxx.c @@ -3560,6 +3560,9 @@ static int stdev_open(const hw_module_t *module, const char *name, stdev->device.get_properties_extended = stdev_get_properties_extended; stdev->opened = true; + stdev->send_sock = -1; + stdev->recv_sock = -1; + /* Initialize all member variable */ for (i = 0; i < MAX_MODELS; i++) { stdev->models[i].type = SOUND_MODEL_TYPE_UNKNOWN; diff --git a/tests/oslo_config_test.c b/tests/oslo_config_test.c index 4056218..c4f87dd 100644 --- a/tests/oslo_config_test.c +++ b/tests/oslo_config_test.c @@ -38,14 +38,14 @@ #define BGT60TR24C_NUM_REGISTERS 0x60 /* Oslo Calibration */ -#define CAL_FILE "/persist/oslo/oslo.cal" +#define CAL_FILE "/mnt/vendor/persist/oslo/oslo.cal" #define CAL_MODES_MAX 10 #define CAL_INVALID_MODE -1 #define CAL_MODE_IS_VALID(x) (x >= 0 && x < CAL_MODES_MAX) #define CAL_VERSION_DEFAULT 1.0f /* Transmit power */ -#define TX_CAL_FILE "/persist/oslo/tx_power.cal" +#define TX_CAL_FILE "/mnt/vendor/persist/oslo/tx_power.cal" typedef enum { INJECT_MODE_OFF = 0, |