nanohub: rename APP_ID_VENDOR_GOOGLE to NANOHUB_VENDOR_GOOGLE
VENDOR codes are used not only by apps but also by other components,
so let's remove the APP reference from vendor code constants
Bug: 30189428
Change-Id: Id0da49f68acd551e728462a4204da2fda78161d4
Signed-off-by: Alexey Polyudov <[email protected]>
diff --git a/firmware/app/test0.app/test_app0.c b/firmware/app/test0.app/test_app0.c
index 9ea8417..1c02d15 100644
--- a/firmware/app/test0.app/test_app0.c
+++ b/firmware/app/test0.app/test_app0.c
@@ -58,7 +58,7 @@
te = evtData;
eOsLog(LOG_INFO, "App 0 received timer %u callback: %d (TIM: %lld, RTC: %lld, SENSOR: %lld, HOST: %lld)\n", te->timerId, *(int *)te->data, eOsTimGetTime(), eOsRtcGetTime(), eOsSensorGetTime(), eOsHostGetTime());
extMsg = eOsHeapAlloc(sizeof(*extMsg));
- extMsg->hdr.appId = APP_ID_MAKE(APP_ID_VENDOR_GOOGLE, 0x548000);
+ extMsg->hdr.appId = APP_ID_MAKE(NANOHUB_VENDOR_GOOGLE, 0x548000);
extMsg->hdr.dataLen = 5;
extMsg->msg = 0x01;
extMsg->val = *(int *)te->data;
diff --git a/firmware/os/core/hostIntf.c b/firmware/os/core/hostIntf.c
index a8fd5ed..9fe78a7 100644
--- a/firmware/os/core/hostIntf.c
+++ b/firmware/os/core/hostIntf.c
@@ -1072,7 +1072,7 @@
if (resp) {
resp->hdr = (struct NanohubHalHdr){
- .appId = APP_ID_MAKE(APP_ID_VENDOR_GOOGLE, 0),
+ .appId = APP_ID_MAKE(NANOHUB_VENDOR_GOOGLE, 0),
.len = sizeof(*resp) - sizeof(resp->hdr) + sizeof(resp->hdr.msg),
.msg = NANOHUB_HAL_REBOOT,
};
@@ -1459,4 +1459,4 @@
cpuIntsRestore(state);
}
-INTERNAL_APP_INIT(APP_ID_MAKE(APP_ID_VENDOR_GOOGLE, 0), 0, hostIntfRequest, hostIntfRelease, hostIntfHandleEvent);
+INTERNAL_APP_INIT(APP_ID_MAKE(NANOHUB_VENDOR_GOOGLE, 0), 0, hostIntfRequest, hostIntfRelease, hostIntfHandleEvent);
diff --git a/firmware/os/core/nanohubCommand.c b/firmware/os/core/nanohubCommand.c
index 79387d6..a9cd640 100644
--- a/firmware/os/core/nanohubCommand.c
+++ b/firmware/os/core/nanohubCommand.c
@@ -1002,7 +1002,7 @@
resp = heapAlloc(sizeof(*resp));
if (resp) {
resp->hdr = (struct NanohubHalHdr) {
- .appId = APP_ID_MAKE(APP_ID_VENDOR_GOOGLE, 0),
+ .appId = APP_ID_MAKE(NANOHUB_VENDOR_GOOGLE, 0),
.len = sizeof(*resp) - sizeof(resp->hdr) + sizeof(resp->hdr.msg),
.msg = cmd,
};
@@ -1046,7 +1046,7 @@
if (osAppInfoByIndex(le32toh(req->idx), &appId, &appVer, &appSize)) {
resp = heapAlloc(sizeof(*resp));
- resp->hdr.appId = APP_ID_MAKE(APP_ID_VENDOR_GOOGLE, 0);
+ resp->hdr.appId = APP_ID_MAKE(NANOHUB_VENDOR_GOOGLE, 0);
resp->hdr.len = sizeof(*resp) - sizeof(struct NanohubHalHdr) + 1;
resp->hdr.msg = NANOHUB_HAL_QUERY_APPS;
resp->appId = appId;
@@ -1056,7 +1056,7 @@
osEnqueueEvtOrFree(EVT_APP_TO_HOST, resp, heapFree);
} else {
hdr = heapAlloc(sizeof(*hdr));
- hdr->appId = APP_ID_MAKE(APP_ID_VENDOR_GOOGLE, 0);
+ hdr->appId = APP_ID_MAKE(NANOHUB_VENDOR_GOOGLE, 0);
hdr->len = 1;
hdr->msg = NANOHUB_HAL_QUERY_APPS;
osEnqueueEvtOrFree(EVT_APP_TO_HOST, hdr, heapFree);
@@ -1082,7 +1082,7 @@
memcpy(resp->data, (uint8_t *)ptr + req->offset, len);
}
- resp->hdr.appId = APP_ID_MAKE(APP_ID_VENDOR_GOOGLE, 0);
+ resp->hdr.appId = APP_ID_MAKE(NANOHUB_VENDOR_GOOGLE, 0);
resp->hdr.len = sizeof(*resp) - sizeof(struct NanohubHalHdr) + 1 + len;
resp->hdr.msg = NANOHUB_HAL_QUERY_RSA_KEYS;
@@ -1100,7 +1100,7 @@
if (!(resp = heapAlloc(sizeof(*resp))))
return;
- resp->hdr.appId = APP_ID_MAKE(APP_ID_VENDOR_GOOGLE, 0);
+ resp->hdr.appId = APP_ID_MAKE(NANOHUB_VENDOR_GOOGLE, 0);
resp->hdr.len = sizeof(*resp) - sizeof(struct NanohubHalHdr) + 1;
resp->hdr.msg = NANOHUB_HAL_START_UPLOAD;
resp->success = doStartFirmwareUpload(&hwReq);
@@ -1119,7 +1119,7 @@
if (!(resp = heapAlloc(sizeof(*resp))))
return;
- resp->hdr.appId = APP_ID_MAKE(APP_ID_VENDOR_GOOGLE, 0);
+ resp->hdr.appId = APP_ID_MAKE(NANOHUB_VENDOR_GOOGLE, 0);
resp->hdr.len = sizeof(*resp) - sizeof(struct NanohubHalHdr) + 1;
resp->hdr.msg = NANOHUB_HAL_CONT_UPLOAD;
@@ -1147,7 +1147,7 @@
if (!(resp = heapAlloc(sizeof(*resp))))
return;
- resp->hdr.appId = APP_ID_MAKE(APP_ID_VENDOR_GOOGLE, 0);
+ resp->hdr.appId = APP_ID_MAKE(NANOHUB_VENDOR_GOOGLE, 0);
resp->hdr.len = sizeof(*resp) - sizeof(struct NanohubHalHdr) + 1;
resp->hdr.msg = NANOHUB_HAL_FINISH_UPLOAD;
diff --git a/firmware/os/drivers/ams_tmd2772/ams_tmd2772.c b/firmware/os/drivers/ams_tmd2772/ams_tmd2772.c
index f37ff59..cb819a2 100644
--- a/firmware/os/drivers/ams_tmd2772/ams_tmd2772.c
+++ b/firmware/os/drivers/ams_tmd2772/ams_tmd2772.c
@@ -673,4 +673,4 @@
}
}
-INTERNAL_APP_INIT(APP_ID_MAKE(APP_ID_VENDOR_GOOGLE, 9), TMD2772_APP_VERSION, init_app, end_app, handle_event);
+INTERNAL_APP_INIT(APP_ID_MAKE(NANOHUB_VENDOR_GOOGLE, 9), TMD2772_APP_VERSION, init_app, end_app, handle_event);
diff --git a/firmware/os/drivers/ams_tmd4903/ams_tmd4903.c b/firmware/os/drivers/ams_tmd4903/ams_tmd4903.c
index e28d754..19597af 100644
--- a/firmware/os/drivers/ams_tmd4903/ams_tmd4903.c
+++ b/firmware/os/drivers/ams_tmd4903/ams_tmd4903.c
@@ -35,7 +35,7 @@
#include <plat/syscfg.h>
#include <variant/variant.h>
-#define AMS_TMD4903_APP_ID APP_ID_MAKE(APP_ID_VENDOR_GOOGLE, 12)
+#define AMS_TMD4903_APP_ID APP_ID_MAKE(NANOHUB_VENDOR_GOOGLE, 12)
#define AMS_TMD4903_APP_VERSION 11
#ifndef PROX_INT_PIN
diff --git a/firmware/os/drivers/bosch_bmi160/bosch_bmi160.c b/firmware/os/drivers/bosch_bmi160/bosch_bmi160.c
index 6553e1f..79aeced 100644
--- a/firmware/os/drivers/bosch_bmi160/bosch_bmi160.c
+++ b/firmware/os/drivers/bosch_bmi160/bosch_bmi160.c
@@ -90,7 +90,7 @@
#include "akm_ak09915_slave.h"
#endif
-#define BMI160_APP_ID APP_ID_MAKE(APP_ID_VENDOR_GOOGLE, 2)
+#define BMI160_APP_ID APP_ID_MAKE(NANOHUB_VENDOR_GOOGLE, 2)
#define BMI160_SPI_WRITE 0x00
#define BMI160_SPI_READ 0x80
diff --git a/firmware/os/drivers/bosch_bmp280/bosch_bmp280.c b/firmware/os/drivers/bosch_bmp280/bosch_bmp280.c
index 4dd623d..b099e00 100644
--- a/firmware/os/drivers/bosch_bmp280/bosch_bmp280.c
+++ b/firmware/os/drivers/bosch_bmp280/bosch_bmp280.c
@@ -27,7 +27,7 @@
#include <seos.h>
#include <timer.h>
-#define BMP280_APP_ID APP_ID_MAKE(APP_ID_VENDOR_GOOGLE, 5)
+#define BMP280_APP_ID APP_ID_MAKE(NANOHUB_VENDOR_GOOGLE, 5)
#define BMP280_APP_VERSION 1
diff --git a/firmware/os/drivers/hall/hall.c b/firmware/os/drivers/hall/hall.c
index 6469177..ef083e3 100644
--- a/firmware/os/drivers/hall/hall.c
+++ b/firmware/os/drivers/hall/hall.c
@@ -224,4 +224,4 @@
sensorUnregister(mTask.sensorHandle);
}
-INTERNAL_APP_INIT(APP_ID_MAKE(APP_ID_VENDOR_GOOGLE, 6), APP_VERSION, startTask, endTask, handleEvent);
+INTERNAL_APP_INIT(APP_ID_MAKE(NANOHUB_VENDOR_GOOGLE, 6), APP_VERSION, startTask, endTask, handleEvent);
diff --git a/firmware/os/drivers/hall_twopole/hall_twopole.c b/firmware/os/drivers/hall_twopole/hall_twopole.c
index 847071f..b2c42c1 100644
--- a/firmware/os/drivers/hall_twopole/hall_twopole.c
+++ b/firmware/os/drivers/hall_twopole/hall_twopole.c
@@ -32,7 +32,7 @@
#include <plat/syscfg.h>
#include <variant/variant.h>
-#define APP_ID APP_ID_MAKE(APP_ID_VENDOR_GOOGLE, 11)
+#define APP_ID APP_ID_MAKE(NANOHUB_VENDOR_GOOGLE, 11)
#define APP_VERSION 2
#define HALL_REPORT_OPENED_VALUE 0
diff --git a/firmware/os/drivers/orientation/orientation.c b/firmware/os/drivers/orientation/orientation.c
index 03fe0c8..ba5d9d7 100644
--- a/firmware/os/drivers/orientation/orientation.c
+++ b/firmware/os/drivers/orientation/orientation.c
@@ -827,7 +827,7 @@
}
INTERNAL_APP_INIT(
- APP_ID_MAKE(APP_ID_VENDOR_GOOGLE, 4),
+ APP_ID_MAKE(NANOHUB_VENDOR_GOOGLE, 4),
ORIENTATION_APP_VERSION,
fusionStart,
fusionEnd,
diff --git a/firmware/os/drivers/rohm_rpr0521/rohm_rpr0521.c b/firmware/os/drivers/rohm_rpr0521/rohm_rpr0521.c
index c0ba625..441241e 100644
--- a/firmware/os/drivers/rohm_rpr0521/rohm_rpr0521.c
+++ b/firmware/os/drivers/rohm_rpr0521/rohm_rpr0521.c
@@ -703,4 +703,4 @@
}
}
-INTERNAL_APP_INIT(APP_ID_MAKE(APP_ID_VENDOR_GOOGLE, 10), RPR0521_APP_VERSION, init_app, end_app, handle_event);
+INTERNAL_APP_INIT(APP_ID_MAKE(NANOHUB_VENDOR_GOOGLE, 10), RPR0521_APP_VERSION, init_app, end_app, handle_event);
diff --git a/firmware/os/drivers/tilt_detection/tilt_detection.c b/firmware/os/drivers/tilt_detection/tilt_detection.c
index 7ed4de0..2e90bd9 100644
--- a/firmware/os/drivers/tilt_detection/tilt_detection.c
+++ b/firmware/os/drivers/tilt_detection/tilt_detection.c
@@ -289,7 +289,7 @@
}
INTERNAL_APP_INIT(
- APP_ID_MAKE(APP_ID_VENDOR_GOOGLE, 8),
+ APP_ID_MAKE(NANOHUB_VENDOR_GOOGLE, 8),
TILT_APP_VERSION,
tiltDetectionStart,
tiltDetectionEnd,
diff --git a/firmware/os/drivers/vsync/vsync.c b/firmware/os/drivers/vsync/vsync.c
index b541ee1..786f109 100644
--- a/firmware/os/drivers/vsync/vsync.c
+++ b/firmware/os/drivers/vsync/vsync.c
@@ -33,7 +33,7 @@
#include <plat/syscfg.h>
#include <variant/variant.h>
-#define VSYNC_APP_ID APP_ID_MAKE(APP_ID_VENDOR_GOOGLE, 7)
+#define VSYNC_APP_ID APP_ID_MAKE(NANOHUB_VENDOR_GOOGLE, 7)
#define VSYNC_APP_VERSION 2
// This defines how many vsync events we could handle being backed up in the
diff --git a/firmware/os/drivers/window_orientation/window_orientation.c b/firmware/os/drivers/window_orientation/window_orientation.c
index 2c6c94a..a81b3db 100644
--- a/firmware/os/drivers/window_orientation/window_orientation.c
+++ b/firmware/os/drivers/window_orientation/window_orientation.c
@@ -592,7 +592,7 @@
}
INTERNAL_APP_INIT(
- APP_ID_MAKE(APP_ID_VENDOR_GOOGLE, 3),
+ APP_ID_MAKE(NANOHUB_VENDOR_GOOGLE, 3),
WINDOW_ORIENTATION_APP_VERSION,
window_orientation_start,
windowOrientationEnd,
diff --git a/firmware/os/inc/seos.h b/firmware/os/inc/seos.h
index 9cc8afb..8206566 100644
--- a/firmware/os/inc/seos.h
+++ b/firmware/os/inc/seos.h
@@ -93,7 +93,7 @@
#define APP_ID_GET_SEQ_ID(appid) ((appid) & 0xFFFFFF)
#define APP_ID_MAKE(vendor, app) ((((uint64_t)(vendor)) << 24) | ((app) & APP_SEQ_ID_ANY))
#define KEY_ID_MAKE(vendor, key) ((((uint64_t)(vendor)) << 24) | ((key) & KEY_SEQ_ID_ANY))
-#define APP_ID_VENDOR_GOOGLE UINT64_C(0x476F6F676C) // "Googl"
+#define NANOHUB_VENDOR_GOOGLE UINT64_C(0x476F6F676C) // "Googl"
#define APP_VENDOR_ANY UINT64_C(0xFFFFFFFFFF)
#define APP_SEQ_ID_ANY UINT64_C(0xFFFFFF)
#define KEY_SEQ_ID_ANY UINT64_C(0xFFFFFF)
