diff --git a/general/package/ingenic-opensdk/src/kernel/sensor_info/sample_sinfo.c b/general/package/ingenic-opensdk/src/kernel/sensor_info/sample_sinfo.c index 1ffc0311..90a1c72e 100644 --- a/general/package/ingenic-opensdk/src/kernel/sensor_info/sample_sinfo.c +++ b/general/package/ingenic-opensdk/src/kernel/sensor_info/sample_sinfo.c @@ -23,92 +23,6 @@ #define SENSOR_TYPE_INVALID -1 -enum SENSOR_TYPE -{ - SENSOR_TYPE_OV9712=0, - SENSOR_TYPE_OV9732, - SENSOR_TYPE_OV9750, - SENSOR_TYPE_JXH42, - SENSOR_TYPE_SC1035, - SENSOR_TYPE_SC1135, - SENSOR_TYPE_SC1045, - SENSOR_TYPE_SC1145, - SENSOR_TYPE_AR0130, - SENSOR_TYPE_JXH61, - SENSOR_TYPE_GC1024, - SENSOR_TYPE_GC1064, - SENSOR_TYPE_GC2023, - SENSOR_TYPE_BF3115, - SENSOR_TYPE_IMX225, - SENSOR_TYPE_OV2710, - SENSOR_TYPE_IMX323, - SENSOR_TYPE_SC2135, - SENSOR_TYPE_SP1409, - SENSOR_TYPE_JXH62, - SENSOR_TYPE_BG0806, - SENSOR_TYPE_OV4689, - SENSOR_TYPE_JXF22, - SENSOR_TYPE_IMX322, - SENSOR_TYPE_IMX291, - SENSOR_TYPE_OV2735, - SENSOR_TYPE_SC3035, - SENSOR_TYPE_AR0237, - SENSOR_TYPE_SC2145, - SENSOR_TYPE_JXH65, - SENSOR_TYPE_SC2300, - SENSOR_TYPE_OV2735B, - SENSOR_TYPE_JXV01, - SENSOR_TYPE_PS5230, - SENSOR_TYPE_PS5250, - SENSOR_TYPE_OV2718, - SENSOR_TYPE_OV2732, - SENSOR_TYPE_SC2235, - SENSOR_TYPE_JXK02, - SENSOR_TYPE_OV7740, - SENSOR_TYPE_HM2140, - SENSOR_TYPE_GC2033, - SENSOR_TYPE_JXF28, - SENSOR_TYPE_OS02B10, - SENSOR_TYPE_OS05A10, - SENSOR_TYPE_SC2232, - SENSOR_TYPE_SC2232H, - SENSOR_TYPE_SC2230, - SENSOR_TYPE_SC4236, - SENSOR_TYPE_SC1245, - SENSOR_TYPE_SC1245A, - SENSOR_TYPE_GC1034, - SENSOR_TYPE_SC1235, - SENSOR_TYPE_JXF23, - SENSOR_TYPE_PS5270, - SENSOR_TYPE_SP140A, - SENSOR_TYPE_SC2310, - SENSOR_TYPE_HM2131, - SENSOR_TYPE_MIS2003, - SENSOR_TYPE_JXK03, - SENSOR_TYPE_SC5235, - SENSOR_TYPE_OV5648, - SENSOR_TYPE_PS5280, - SENSOR_TYPE_JXF23S, - SENSOR_TYPE_GC2053, - SENSOR_TYPE_SC4335, - SENSOR_TYPE_PS5260, - SENSOR_TYPE_OS04B10, - SENSOR_TYPE_JXK05, - SENSOR_TYPE_JXH63, - SENSOR_TYPE_SC2335, - SENSOR_TYPE_JXF37, - SENSOR_TYPE_GC4653, - SENSOR_TYPE_C23A98, - SENSOR_TYPE_SC3335, - SENSOR_TYPE_SC3235, - SENSOR_TYPE_SC200AI, - SENSOR_TYPE_SC401AI, - SENSOR_TYPE_SC500AI, - SENSOR_TYPE_JXQ03, - SENSOR_TYPE_JXQ03P, - SENSOR_TYPE_GC2083, -}; - typedef struct SENSOR_INFO_S { unsigned char *name; @@ -126,6 +40,7 @@ SENSOR_INFO_T g_sinfo[] = {"sc1145"}, {"ar0130"}, {"jxh61"}, + {"gc2083"}, {"gc1024"}, {"gc1064"}, {"gc2023"}, @@ -140,6 +55,7 @@ SENSOR_INFO_T g_sinfo[] = {"ov4689"}, {"jxf22"}, {"imx322"}, + {"imx307"}, {"imx291"}, {"ov2735"}, {"sc3035"}, @@ -197,7 +113,7 @@ SENSOR_INFO_T g_sinfo[] = {"sc500ai"}, {"jxq03"}, {"jxq03p"}, - {"gc2083"}, + }; int main(int argc,char **argv) { diff --git a/general/package/ingenic-opensdk/src/kernel/sensor_info/sensor_info.c b/general/package/ingenic-opensdk/src/kernel/sensor_info/sensor_info.c index 9dcf2da4..66244cf7 100644 --- a/general/package/ingenic-opensdk/src/kernel/sensor_info/sensor_info.c +++ b/general/package/ingenic-opensdk/src/kernel/sensor_info/sensor_info.c @@ -88,92 +88,6 @@ typedef struct SENSOR_INFO_S struct i2c_adapter *adap; } SENSOR_INFO_T, *SENSOR_INFO_P; -enum SENSOR_TYPE -{ - SENSOR_TYPE_OV9712=0, - SENSOR_TYPE_OV9732, - SENSOR_TYPE_OV9750, - SENSOR_TYPE_JXH42, - SENSOR_TYPE_SC1035, - SENSOR_TYPE_SC1135, - SENSOR_TYPE_SC1045, - SENSOR_TYPE_SC1145, - SENSOR_TYPE_AR0130, - SENSOR_TYPE_JXH61, - SENSOR_TYPE_GC1024, - SENSOR_TYPE_GC1064, - SENSOR_TYPE_GC2023, - SENSOR_TYPE_BF3115, - SENSOR_TYPE_IMX225, - SENSOR_TYPE_OV2710, - SENSOR_TYPE_IMX323, - SENSOR_TYPE_SC2135, - SENSOR_TYPE_SP1409, - SENSOR_TYPE_JXH62, - SENSOR_TYPE_BG0806, - SENSOR_TYPE_OV4689, - SENSOR_TYPE_JXF22, - SENSOR_TYPE_IMX322, - SENSOR_TYPE_IMX291, - SENSOR_TYPE_OV2735, - SENSOR_TYPE_SC3035, - SENSOR_TYPE_AR0237, - SENSOR_TYPE_SC2145, - SENSOR_TYPE_JXH65, - SENSOR_TYPE_SC2300, - SENSOR_TYPE_OV2735B, - SENSOR_TYPE_JXV01, - SENSOR_TYPE_PS5230, - SENSOR_TYPE_PS5250, - SENSOR_TYPE_OV2718, - SENSOR_TYPE_OV2732, - SENSOR_TYPE_SC2235, - SENSOR_TYPE_JXK02, - SENSOR_TYPE_OV7740, - SENSOR_TYPE_HM2140, - SENSOR_TYPE_GC2033, - SENSOR_TYPE_JXF28, - SENSOR_TYPE_OS02B10, - SENSOR_TYPE_OS05A10, - SENSOR_TYPE_SC2232, - SENSOR_TYPE_SC2232H, - SENSOR_TYPE_SC2230, - SENSOR_TYPE_SC4236, - SENSOR_TYPE_SC1245, - SENSOR_TYPE_SC1245A, - SENSOR_TYPE_GC1034, - SENSOR_TYPE_SC1235, - SENSOR_TYPE_JXF23, - SENSOR_TYPE_PS5270, - SENSOR_TYPE_SP140A, - SENSOR_TYPE_SC2310, - SENSOR_TYPE_HM2131, - SENSOR_TYPE_MIS2003, - SENSOR_TYPE_JXK03, - SENSOR_TYPE_SC5235, - SENSOR_TYPE_OV5648, - SENSOR_TYPE_PS5280, - SENSOR_TYPE_JXF23S, - SENSOR_TYPE_GC2053, - SENSOR_TYPE_SC4335, - SENSOR_TYPE_PS5260, - SENSOR_TYPE_OS04B10, - SENSOR_TYPE_JXK05, - SENSOR_TYPE_JXH63, - SENSOR_TYPE_SC2335, - SENSOR_TYPE_JXF37, - SENSOR_TYPE_GC4653, - SENSOR_TYPE_C23A98, - SENSOR_TYPE_SC3335, - SENSOR_TYPE_SC3235, - SENSOR_TYPE_SC200AI, - SENSOR_TYPE_SC401AI, - SENSOR_TYPE_SC500AI, - SENSOR_TYPE_JXQ03, - SENSOR_TYPE_JXQ03P, - SENSOR_TYPE_GC2083, -}; - SENSOR_INFO_T g_sinfo[] = { {"ov9712", 0x30, "cgu_cim", 24000000, {0x97, 0x11}, 1, {0xa, 0xb}, 1, 2, NULL}, @@ -186,6 +100,7 @@ SENSOR_INFO_T g_sinfo[] = {"sc1145", 0x30, "cgu_cim", 24000000, {0x11, 0x45}, 1, {0x3107, 0x3108}, 2, 2, NULL}, {"ar0130", 0x10, "cgu_cim", 24000000, {0x2402}, 2, {0x3000}, 2, 1, NULL}, {"jxh61", 0x30, "cgu_cim", 24000000, {0xa0, 0x42, 0x3}, 1, {0xa, 0xb, 0x9}, 1, 3, NULL}, + {"gc2083", 0x37, "cgu_cim", 24000000, {0x20, 0x83}, 1, {0x3f0, 0x3f1}, 2, 2, NULL}, {"gc1024", 0x3c, "cgu_cim", 24000000, {0x10, 0x04}, 1, {0xf0, 0xf1}, 1, 2, NULL}, {"gc1064", 0x3c, "cgu_cim", 24000000, {0x10, 0x24}, 1, {0xf0, 0xf1}, 1, 2, NULL}, {"gc2023", 0x37, "cgu_cim", 24000000, {0x20, 0x23}, 1, {0xf0, 0xf1}, 1, 2, NULL}, @@ -258,7 +173,7 @@ SENSOR_INFO_T g_sinfo[] = {"sc500ai", 0x30, "cgu_cim", 24000000, {0xce, 0x1f}, 1, {0x3107, 0x3108}, 2, 2, NULL}, {"jxq03", 0x40, "cgu_cim", 24000000, {0x05, 0x07}, 1, {0xa, 0xb}, 1, 2, NULL}, {"jxq03p", 0x40, "cgu_cim", 24000000, {0x08, 0x43}, 1, {0xa, 0xb}, 1, 2, NULL}, - {"gc2083", 0x37, "cgu_cim", 24000000, {0x20, 0x83}, 1, {0xf0, 0xf1}, 1, 2, NULL}, + }; static int8_t g_sensor_id = -1; diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sinfo.ko b/general/package/ingenic-osdrv-t31/files/kmod/sinfo.ko index cf5b4c75..c4f8f96a 100644 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sinfo.ko and b/general/package/ingenic-osdrv-t31/files/kmod/sinfo.ko differ