Skip to content

Commit 129ee43

Browse files
drebbe-intrepiddrebbe-intrepid
authored
V922.16 (#224)
* Update to 9.22.16 * fixed function signatures in various functions
1 parent b4adcee commit 129ee43

3 files changed

Lines changed: 217 additions & 19 deletions

File tree

‎include/ics/icsnVC40.h‎

Lines changed: 194 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@ typedef unsigned __int64 uint64_t;
253253
#define NEODEVICE_GIGASTAR2 (0x00000029)
254254
#define NEODEVICE_FIRE3_T1S_LIN (0x0000002A)
255255
#define NEODEVICE_FIRE3_T1S_SENT (0x0000002B)
256+
#define NEODEVICE_RADGEMINI (0x0000002C)
256257

257258
#define NEODEVICE_RED (0x00000040)
258259
#define NEODEVICE_ECU (0x00000080)
@@ -285,7 +286,7 @@ typedef unsigned __int64 uint64_t;
285286
#define NEODEVICE_NEOECUCHIP NEODEVICE_IEVB_DEPRECATED
286287
//clang-format on
287288

288-
#define DEVICECOUNT_FOR_EXPLORER (34) //this value will be checked by the NeoViExplorer after #6453!
289+
#define DEVICECOUNT_FOR_EXPLORER (36) //this value will be checked by the NeoViExplorer after #6453!
289290

290291
#define ISO15765_2_NETWORK_HSCAN 0x01
291292
#define ISO15765_2_NETWORK_MSCAN 0x02
@@ -568,6 +569,7 @@ typedef struct _stAPIFirmwareInfo
568569
/* Define number of CMP streams per device*/
569570
#define CMP_STREAMS_FIRE3 (10)
570571
#define CMP_STREAMS_FIRE3FR (10)
572+
#define CMP_STREAMS_FIRE3T1SLIN (10)
571573
#define CMP_STREAMS_RED2 (10)
572574
#define CMP_STREAMS_A2B (3)
573575
#define CMP_STREAMS_GIGASTAR (10)
@@ -951,6 +953,11 @@ typedef union _stChipVersions
951953
uint8_t mchip_major;
952954
uint8_t mchip_minor;
953955
} radmoon3_versions;
956+
struct
957+
{
958+
uint8_t mchip_major;
959+
uint8_t mchip_minor;
960+
} radgemini_versions;
954961

955962
struct
956963
{
@@ -1007,6 +1014,16 @@ typedef union _stChipVersions
10071014
uint8_t vem_f_minor;
10081015
} fire3_flexray_versions;
10091016

1017+
struct
1018+
{
1019+
uint8_t zchip_major;
1020+
uint8_t zchip_minor;
1021+
uint8_t schip_major;
1022+
uint8_t schip_minor;
1023+
uint8_t vem_z_major;
1024+
uint8_t vem_z_minor;
1025+
} fire3_t1slin_versions;
1026+
10101027
struct
10111028
{
10121029
uint8_t zynq_core_major;
@@ -1271,6 +1288,7 @@ typedef enum
12711288
SFP_ID_ICS_MV3244,
12721289
SFP_ID_ICS_MC8670,
12731290
SFP_ID_ICS_EN11100,
1291+
SFP_ID_ICS_AD1101,
12741292
// add new entries here
12751293
SFP_ID_MAX,
12761294
} SfpId;
@@ -1397,6 +1415,13 @@ typedef struct ETHERNET10T1S_SETTINGS_EXT_t
13971415
} ETHERNET10T1S_SETTINGS_EXT;
13981416
#define ETHERNET10T1S_SETTINGS_EXT_SIZE 16
13991417

1418+
typedef struct ETHERNET10T1L_SETTINGS_t
1419+
{
1420+
uint8_t tx_mode;
1421+
uint8_t rsvd[7];
1422+
} ETHERNET10T1L_SETTINGS;
1423+
#define ETHERNET10T1L_SETTINGS_SIZE 8
1424+
14001425
/*
14011426
* START - MACsec Definitions
14021427
*/
@@ -2948,6 +2973,31 @@ typedef struct _SRADMoon3Settings
29482973

29492974
#define SRADMoon3Settings_SIZE 68
29502975

2976+
typedef struct _SRADGeminiSettings
2977+
{
2978+
uint16_t perf_en; // 2
2979+
2980+
ETHERNET_SETTINGS2 ethernet1; // 16
2981+
ETHERNET_SETTINGS2 ethernet2; // 16
2982+
ETHERNET_SETTINGS2 autoEthernet1; // 16
2983+
ETHERNET_SETTINGS2 autoEthernet2; // 16
2984+
2985+
uint16_t network_enabled_on_boot; // 2
2986+
uint16_t network_enables; // 2
2987+
uint16_t network_enables_2; // 2
2988+
uint16_t network_enables_3; // 2
2989+
uint16_t network_enables_4; // 2
2990+
uint64_t network_enables_5; // 8
2991+
2992+
struct
2993+
{
2994+
uint16_t enableLatencyTest : 1;
2995+
uint16_t reserved : 15;
2996+
} flags; // 2
2997+
} SRADGeminiSettings;
2998+
2999+
#define SRADGeminiSettings_SIZE 86
3000+
29513001
typedef struct _SRADGigastarSettings
29523002
{
29533003
uint32_t ecu_id;
@@ -3030,9 +3080,12 @@ typedef struct _SRADGigastarSettings
30303080

30313081
CMP_GLOBAL_DATA cmp_global_data;
30323082
CMP_NETWORK_DATA cmp_stream_data[CMP_STREAMS_GIGASTAR];
3083+
// SFP T1L
3084+
ETHERNET10T1L_SETTINGS sfp_t1l_1;
3085+
ETHERNET10T1L_SETTINGS sfp_t1l_2;
30333086
} SRADGigastarSettings;
30343087

3035-
#define SRADGigastarSettings_SIZE 1010
3088+
#define SRADGigastarSettings_SIZE 1026
30363089

30373090
typedef struct _SRADGalaxy2Settings
30383091
{
@@ -3824,6 +3877,129 @@ typedef struct _SFire3FlexraySettings
38243877
} SFire3FlexraySettings;
38253878
#define SFire3FlexraySettings_SIZE (1372)
38263879

3880+
typedef struct _SFire3T1SLINSettings
3881+
{
3882+
uint16_t perf_en;
3883+
uint16_t network_enabled_on_boot;
3884+
uint16_t misc_io_on_report_events;
3885+
uint16_t pwr_man_enable;
3886+
int16_t iso15765_separation_time_offset;
3887+
uint16_t slaveVnetA;
3888+
uint32_t reserved;
3889+
uint64_t termination_enables_1;
3890+
uint64_t network_enables;
3891+
uint32_t pwr_man_timeout;
3892+
CAN_SETTINGS can1;
3893+
CANFD_SETTINGS canfd1;
3894+
CAN_SETTINGS can2;
3895+
CANFD_SETTINGS canfd2;
3896+
CAN_SETTINGS can3;
3897+
CANFD_SETTINGS canfd3;
3898+
CAN_SETTINGS can4;
3899+
CANFD_SETTINGS canfd4;
3900+
CAN_SETTINGS can5;
3901+
CANFD_SETTINGS canfd5;
3902+
CAN_SETTINGS can6;
3903+
CANFD_SETTINGS canfd6;
3904+
CAN_SETTINGS can7;
3905+
CANFD_SETTINGS canfd7;
3906+
CAN_SETTINGS can8;
3907+
CANFD_SETTINGS canfd8;
3908+
LIN_SETTINGS lin1;
3909+
LIN_SETTINGS lin2;
3910+
ISO9141_KEYWORD2000_SETTINGS iso9141_kwp_settings_1;
3911+
uint16_t iso_parity_1;
3912+
uint16_t iso_msg_termination_1;
3913+
ISO9141_KEYWORD2000_SETTINGS iso9141_kwp_settings_2;
3914+
uint16_t iso_parity_2;
3915+
uint16_t iso_msg_termination_2;
3916+
ETHERNET_SETTINGS ethernet_1;
3917+
TIMESYNC_ICSHARDWARE_SETTINGS timeSync;
3918+
STextAPISettings text_api;
3919+
struct
3920+
{
3921+
uint32_t disableUsbCheckOnBoot : 1;
3922+
uint32_t enableLatencyTest : 1;
3923+
uint32_t busMessagesToAndroid : 1;
3924+
uint32_t reserved1 : 1;
3925+
uint32_t enableDefaultLogger : 1;
3926+
uint32_t enableDefaultUpload : 1;
3927+
uint32_t reserved : 26;
3928+
} flags;
3929+
DISK_SETTINGS disk;
3930+
uint16_t misc_io_report_period;
3931+
uint16_t ain_threshold;
3932+
uint16_t misc_io_analog_enable;
3933+
uint16_t digitalIoThresholdTicks;
3934+
uint16_t digitalIoThresholdEnable;
3935+
uint16_t misc_io_initial_ddr;
3936+
uint16_t misc_io_initial_latch;
3937+
ETHERNET_SETTINGS2 ethernet2_1;
3938+
ETHERNET_SETTINGS ethernet_2;
3939+
ETHERNET_SETTINGS2 ethernet2_2;
3940+
Fire3LinuxSettings os_settings;
3941+
RAD_GPTP_SETTINGS gPTP;
3942+
3943+
/* VEM */
3944+
// 10T1S
3945+
ETHERNET_SETTINGS2 ethT1s1;
3946+
ETHERNET10T1S_SETTINGS t1s1;
3947+
ETHERNET10T1S_SETTINGS_EXT t1s1Ext;
3948+
// 10T1S
3949+
ETHERNET_SETTINGS2 ethT1s2;
3950+
ETHERNET10T1S_SETTINGS t1s2;
3951+
ETHERNET10T1S_SETTINGS_EXT t1s2Ext;
3952+
// 10T1S
3953+
ETHERNET_SETTINGS2 ethT1s3;
3954+
ETHERNET10T1S_SETTINGS t1s3;
3955+
ETHERNET10T1S_SETTINGS_EXT t1s3Ext;
3956+
// 10T1S
3957+
ETHERNET_SETTINGS2 ethT1s4;
3958+
ETHERNET10T1S_SETTINGS t1s4;
3959+
ETHERNET10T1S_SETTINGS_EXT t1s4Ext;
3960+
// 10T1S
3961+
ETHERNET_SETTINGS2 ethT1s5;
3962+
ETHERNET10T1S_SETTINGS t1s5;
3963+
ETHERNET10T1S_SETTINGS_EXT t1s5Ext;
3964+
// 10T1S
3965+
ETHERNET_SETTINGS2 ethT1s6;
3966+
ETHERNET10T1S_SETTINGS t1s6;
3967+
ETHERNET10T1S_SETTINGS_EXT t1s6Ext;
3968+
// 10T1S
3969+
ETHERNET_SETTINGS2 ethT1s7;
3970+
ETHERNET10T1S_SETTINGS t1s7;
3971+
ETHERNET10T1S_SETTINGS_EXT t1s7Ext;
3972+
// 10T1S
3973+
ETHERNET_SETTINGS2 ethT1s8;
3974+
ETHERNET10T1S_SETTINGS t1s8;
3975+
ETHERNET10T1S_SETTINGS_EXT t1s8Ext;
3976+
3977+
LIN_SETTINGS lin3;
3978+
LIN_SETTINGS lin4;
3979+
LIN_SETTINGS lin5;
3980+
LIN_SETTINGS lin6;
3981+
LIN_SETTINGS lin7;
3982+
LIN_SETTINGS lin8;
3983+
LIN_SETTINGS lin9;
3984+
LIN_SETTINGS lin10;
3985+
3986+
ISO9141_KEYWORD2000_SETTINGS iso9141_kwp_settings_3;
3987+
uint16_t iso_parity_3;
3988+
uint16_t iso_msg_termination_3;
3989+
ISO9141_KEYWORD2000_SETTINGS iso9141_kwp_settings_4;
3990+
uint16_t iso_parity_4;
3991+
uint16_t iso_msg_termination_4;
3992+
3993+
uint16_t iso_tester_pullup_enable;
3994+
3995+
uint64_t network_enables_5;
3996+
3997+
CMP_GLOBAL_DATA cmp_global_data;
3998+
CMP_NETWORK_DATA cmp_stream_data[CMP_STREAMS_FIRE3T1SLIN];
3999+
uint32_t networkTimeSync;
4000+
} SFire3T1sLinSettings;
4001+
#define SFire3T1sLinSettings_SIZE (1594)
4002+
38274003
#define RADEPSILON_NUM_PORTS 18 // ATSAM + PHYs
38284004
#define RADEPSILON_MAX_PHY 18
38294005
#define EPSILON_88Q6113_SWITCH_A 1
@@ -4303,8 +4479,11 @@ typedef struct _SRADGigaStar2Settings
43034479
LIN_SETTINGS lin14;
43044480
LIN_SETTINGS lin15;
43054481
LIN_SETTINGS lin16;
4482+
// SFP T1L
4483+
ETHERNET10T1L_SETTINGS sfp_t1l_1;
4484+
ETHERNET10T1L_SETTINGS sfp_t1l_2;
43064485
} SRADGigastar2Settings;
4307-
#define SRADGigastar2Settings_SIZE 2140
4486+
#define SRADGigastar2Settings_SIZE 2156
43084487

43094488
// variants to be used with icsneoSetFirmwareVariant
43104489
enum Gigastar2FwVariants
@@ -4443,10 +4622,12 @@ typedef struct _GLOBAL_SETTINGS
44434622
SRed2Settings red2;
44444623
SFire3Settings fire3;
44454624
SFire3FlexraySettings fire3fr;
4625+
SFire3T1sLinSettings fire3t1slin;
44464626
SRADA2BSettings rad_a2b;
44474627
SRADEpsilonSettings epsilon;
44484628
SRADBMSSettings rad_bms;
44494629
SRADMoon3Settings radmoon3;
4630+
SRADGeminiSettings radgemini;
44504631
SRADCometSettings radcomet;
44514632
SRADComet3Settings radcomet3;
44524633
SRADGigastar2Settings radgigastar2;
@@ -4505,6 +4686,8 @@ typedef enum _EDeviceSettingsType
45054686
DeviceRADGalaxy2SettingsType,
45064687
DeviceRADGigastar2SettingsType,
45074688
DeviceRADMoonT1SSettingsType,
4689+
DeviceRADGeminiSettingsType,
4690+
DeviceFire3T1sLinSettingsType,
45084691
// add new settings type here
45094692
// Also add to map inside cicsneoVI::Init()
45104693
DeviceSettingsTypeMax,
@@ -4544,7 +4727,9 @@ typedef struct _SDeviceSettings
45444727
SRADEpsilonSettings epsilon;
45454728
SRADBMSSettings rad_bms;
45464729
SRADMoon3Settings radmoon3;
4730+
SRADGeminiSettings radgemini;
45474731
SFire3FlexraySettings fire3Flexray;
4732+
SFire3T1sLinSettings fire3t1slin;
45484733
SRADCometSettings radcomet;
45494734
SRADComet3Settings radcomet3;
45504735
SRADGigastar2Settings radgigastar2;
@@ -5144,7 +5329,9 @@ typedef struct
51445329
typedef struct
51455330
{
51465331
uint8_t ethernetActivationLineEnabled;
5147-
ethernetNetworkStatus_t ethernetStatus[3];
5332+
ethernetNetworkStatus_t ethernetStatus[16];
5333+
uint8_t numNetworks;
5334+
uint8_t reserved;
51485335
uint8_t ethernetActivationLineEnabled_2;
51495336
} icsFire3DeviceStatus;
51505337

@@ -5399,6 +5586,7 @@ CHECK_STRUCT_SIZE(ETHERNET_SETTINGS2);
53995586
CHECK_STRUCT_SIZE(ETHERNET10G_SETTINGS);
54005587
CHECK_STRUCT_SIZE(ETHERNET10T1S_SETTINGS);
54015588
CHECK_STRUCT_SIZE(ETHERNET10T1S_SETTINGS_EXT);
5589+
CHECK_STRUCT_SIZE(ETHERNET10T1L_SETTINGS);
54025590
CHECK_STRUCT_SIZE(MACSEC_SETTINGS);
54035591
CHECK_STRUCT_SIZE(LOGGER_SETTINGS);
54045592
CHECK_STRUCT_SIZE(DISK_SETTINGS);
@@ -5444,7 +5632,9 @@ CHECK_STRUCT_SIZE(SRADEpsilonSettings);
54445632
CHECK_STRUCT_SIZE(RAD_GPTP_SETTINGS);
54455633
CHECK_STRUCT_SIZE(SRADBMSSettings);
54465634
CHECK_STRUCT_SIZE(SRADMoon3Settings);
5635+
CHECK_STRUCT_SIZE(SRADGeminiSettings);
54475636
CHECK_STRUCT_SIZE(SFire3FlexraySettings);
5637+
CHECK_STRUCT_SIZE(SFire3T1sLinSettings);
54485638
CHECK_STRUCT_SIZE(CANHubSettings);
54495639
CHECK_STRUCT_SIZE(SRADCometSettings);
54505640
CHECK_STRUCT_SIZE(SRADComet3Settings);

0 commit comments

Comments
 (0)