qtsoundmodem/debian/patches/build-fix.patch

96 lines
2.2 KiB
Diff
Raw Normal View History

2023-09-04 23:00:40 +01:00
--- a/tcpCode.cpp
+++ b/tcpCode.cpp
2024-11-06 01:30:24 +00:00
@@ -775,7 +775,7 @@
2023-09-04 23:00:40 +01:00
QByteArray datas = HAMLIBsock->readAll();
- qDebug(datas.data());
+ qDebug("SetPTT Error: %s", datas.data());
}
2024-11-06 01:30:24 +00:00
--- a/ax25.c
+++ b/ax25.c
2024-12-24 15:35:54 +00:00
@@ -1757,8 +1757,8 @@
}
2024-11-06 01:35:43 +00:00
2024-12-24 15:35:54 +00:00
-
2024-11-06 01:35:43 +00:00
-get_monitor_path(Byte * path, char * mycall, char * corrcall, char * digi)
2024-12-24 15:35:54 +00:00
+// Hibby - as this returns nothing, assign it type void.
2024-11-06 22:41:35 +00:00
+void get_monitor_path(Byte * path, char * mycall, char * corrcall, char * digi)
2024-11-06 01:35:43 +00:00
{
Byte * digiptr = digi;
2024-12-24 15:35:54 +00:00
--- a/sm_main.c
+++ b/sm_main.c
@@ -796,7 +796,8 @@
void runModems()
{
- int snd_ch, res;
+ int snd_ch;
+ void *res;
pthread_t thread[4] = { 0,0,0,0 };
for (snd_ch = 0; snd_ch < 4; snd_ch++)
--- a/il2p.c
+++ b/il2p.c
@@ -394,6 +394,8 @@
typedef enum cmdres_e { cr_00 = 2, cr_cmd = 1, cr_res = 0, cr_11 = 3 } cmdres_t;
+// G8BPQ update for set_addrs
+int set_addrs(packet_t pp, char addrs[AX25_MAX_ADDRS][AX25_MAX_ADDR_LEN], int num_addr, cmdres_t cr);
extern packet_t ax25_new(void);
2024-11-06 01:35:43 +00:00
--- a/ax25_l2.c
+++ b/ax25_l2.c
2024-12-24 15:35:54 +00:00
@@ -374,7 +374,9 @@
2024-11-06 01:35:43 +00:00
void delete_I_FRM_port(TAX25Port * AX25Sess)
{
string * frame;
- string path = { 0 };
2024-12-24 15:35:54 +00:00
+ //Hibby - Attempting to solve this incompatible type error, see notes
+
2024-11-06 01:35:43 +00:00
+ Byte path[80];
string data= { 0 };
Byte pid, nr, ns, f_type, f_id, rpt, cr, pf;
2024-12-24 15:35:54 +00:00
@@ -385,8 +387,9 @@
{
2024-11-06 01:35:43 +00:00
optimize = TRUE;
frame = Strings(&AX25Sess->frame_buf, i);
2024-12-24 15:35:54 +00:00
-
2024-11-06 01:35:43 +00:00
- decode_frame(frame->Data, frame->Length, &path, &data, &pid, &nr, &ns, &f_type, &f_id, &rpt, &pf, &cr);
2024-12-24 15:35:54 +00:00
+ // Hibby - this alignes decode_frame with other uses in this
+ // file
2024-11-06 01:35:43 +00:00
+ decode_frame(frame->Data, frame->Length, path, &data, &pid, &nr, &ns, &f_type, &f_id, &rpt, &pf, &cr);
if (f_id == I_I)
{
2024-11-06 22:41:35 +00:00
--- a/SMMain.c
+++ b/SMMain.c
2024-12-24 15:35:54 +00:00
@@ -223,8 +223,8 @@
2024-11-06 22:41:35 +00:00
if (using48000)
{
// Need to upsample to 48K. Try just duplicating sample
-
- uint32_t * ptr = &DMABuffer[2 * Number];
2024-12-24 15:35:54 +00:00
+ // Hibby - explicitly cast short int to uint32_t
+ uint32_t * ptr = (uint32_t *)&DMABuffer[2 * Number];
2024-11-06 22:41:35 +00:00
*(&ptr[1]) = *(ptr);
*(&ptr[2]) = *(ptr);
2024-12-24 15:35:54 +00:00
@@ -388,7 +388,8 @@
2024-11-06 22:41:35 +00:00
#endif
extern int blnBusyStatus;
-BusyDet = 5;
2024-12-24 15:35:54 +00:00
+// Hibby - detail explicitly as int
2024-11-06 22:41:35 +00:00
+int BusyDet = 5;
#define PLOTWATERFALL