From bba6ffb91a4d63b7009e070cb2faaba3a7bb11ba Mon Sep 17 00:00:00 2001
From: Horst Beham <horst.beham@schmitzer.at>
Date: Tue, 27 Jul 2021 12:09:18 +0200
Subject: [PATCH] -  updated Swiss reference lists with new ONID-TSID-SID for
 SRF info HD and RSI LA HD

- added HDD Hex Edit Neo file structure definition for LaSat / ZapMaster / Gran Prix sat receiver files (.lst)
---
 .../ch_astra192E_hotbird130E_freehd.txt       |  6 +-
 .../ch_astra192E_hotbird130E_hdplus.txt       |  6 +-
 .../LaSat_lst.h                               | 57 +++++++++++++++++++
 source/changelog.md                           |  1 +
 4 files changed, 64 insertions(+), 6 deletions(-)
 create mode 100644 source/Information/FileStructures_for_HHD_Hex_Editor_Neo/LaSat_lst.h

diff --git a/source/ChanSort/ReferenceLists/ch_astra192E_hotbird130E_freehd.txt b/source/ChanSort/ReferenceLists/ch_astra192E_hotbird130E_freehd.txt
index 4d67d75..a72e3d5 100644
--- a/source/ChanSort/ReferenceLists/ch_astra192E_hotbird130E_freehd.txt
+++ b/source/ChanSort/ReferenceLists/ch_astra192E_hotbird130E_freehd.txt
@@ -1,10 +1,10 @@
 1;SRF 1 HD;318-12300-17201
 2;SRF zwei HD;318-12300-17202
-3;SRF info HD;318-1700-14053
+3;SRF info HD;318-12300-17206
 4;RTS Un HD;318-12300-17203
 5;RTS Deux HD;318-12300-17204
-6;RSI LA 1 HD;318-1700-14051
-7;RSI LA 2 HD;318-1700-14052
+6;RSI LA 1 HD;318-12300-17207
+7;RSI LA 2 HD;318-12300-17208
 8;BBC World News;318-9400-8204
 9;Das Erste HD;1-1019-10301
 10;ZDF HD;1-1011-11110
diff --git a/source/ChanSort/ReferenceLists/ch_astra192E_hotbird130E_hdplus.txt b/source/ChanSort/ReferenceLists/ch_astra192E_hotbird130E_hdplus.txt
index 9eb6e2b..a8efb2a 100644
--- a/source/ChanSort/ReferenceLists/ch_astra192E_hotbird130E_hdplus.txt
+++ b/source/ChanSort/ReferenceLists/ch_astra192E_hotbird130E_hdplus.txt
@@ -1,10 +1,10 @@
 1;SRF 1 HD;318-12300-17201
 2;SRF zwei HD;318-12300-17202
-3;SRF info HD;318-1700-14053
+3;SRF info HD;318-12300-17206
 4;RTS Un HD;318-12300-17203
 5;RTS Deux HD;318-12300-17204
-6;RSI LA 1 HD;318-1700-14051
-7;RSI LA 2 HD;318-1700-14052
+6;RSI LA 1 HD;318-12300-17207
+7;RSI LA 2 HD;318-12300-17208
 8;BBC World News;318-9400-8204
 9;Das Erste HD;1-1019-10301
 10;ZDF HD;1-1011-11110
diff --git a/source/Information/FileStructures_for_HHD_Hex_Editor_Neo/LaSat_lst.h b/source/Information/FileStructures_for_HHD_Hex_Editor_Neo/LaSat_lst.h
new file mode 100644
index 0000000..deafca4
--- /dev/null
+++ b/source/Information/FileStructures_for_HHD_Hex_Editor_Neo/LaSat_lst.h
@@ -0,0 +1,57 @@
+#include <stddefs.h>
+
+// CRCs are calculated MSB first (left-shift with initial mask 0x80000000), polynomial 0x04C11DB7, init-value 0xFFFFFFFF and exit-XOR 0x00000000
+
+public struct LaSat
+{
+	int32 dataBlockLength;
+	int32 u1;
+	uint32 crcDataBlock;
+	uint8 u2[12];
+	char lasaMarker[4];
+	union
+	{
+		uint8 raw[dataBlockLength];
+		struct
+		{
+			uint8 unk3[52];
+			uint32 crcHeader;
+			uint32 crcChannels;
+			uint32 crcTransponders;
+			uint32 crcSatellites;
+			uint8 header[28];
+			struct
+			{
+				uint16 u1[3];
+				uint16 sid;
+				uint16 u2;
+				uint16 pcrPid;
+				uint16 vpid;
+				uint16 apid2;
+				uint16 vtPid;
+				uint16 apid1;
+				uint16 transponderIndex;
+				char dvbName[20];
+			} channels[4000];
+			struct
+			{
+				uint16 symbolrate;
+				uint16 u1;
+				uint32 freqInHz;
+				uint16 tsid;
+				uint8 u2[3];
+				uint8 satIndexMaybe;
+				uint8 u3[2];
+			} transponders[1000];
+			struct
+			{
+				uint8 u1[4];
+				uint16 lowFreq;
+				uint16 highFreq;
+				char name[20];
+				uint8 u2[2];
+			} satellites[30];
+		} structured;
+	} dataBlock;
+	uint8 suffix_0A_0D[2];
+};
\ No newline at end of file
diff --git a/source/changelog.md b/source/changelog.md
index b2968ec..a53affc 100644
--- a/source/changelog.md
+++ b/source/changelog.md
@@ -4,6 +4,7 @@ ChanSort Change Log
 TBD
 - improved Linux/Wine performance
 - minor fixes ("File / File information" didn't ignore deleted channels when counting duplicates)
+- updated Swiss reference lists with new ONID-TSID-SID for SRF info HD and RSI LA HD
 
 2021-07-26
 - user interface can now be toggled between