96 lines
2.2 KiB
Diff
96 lines
2.2 KiB
Diff
--- a/tcpCode.cpp
|
|
+++ b/tcpCode.cpp
|
|
@@ -775,7 +775,7 @@
|
|
|
|
QByteArray datas = HAMLIBsock->readAll();
|
|
|
|
- qDebug(datas.data());
|
|
+ qDebug("SetPTT Error: %s", datas.data());
|
|
|
|
}
|
|
|
|
--- a/ax25.c
|
|
+++ b/ax25.c
|
|
@@ -1757,8 +1757,8 @@
|
|
}
|
|
|
|
|
|
-
|
|
-get_monitor_path(Byte * path, char * mycall, char * corrcall, char * digi)
|
|
+// Hibby - as this returns nothing, assign it type void.
|
|
+void get_monitor_path(Byte * path, char * mycall, char * corrcall, char * digi)
|
|
{
|
|
Byte * digiptr = digi;
|
|
|
|
--- 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);
|
|
|
|
--- a/ax25_l2.c
|
|
+++ b/ax25_l2.c
|
|
@@ -374,7 +374,9 @@
|
|
void delete_I_FRM_port(TAX25Port * AX25Sess)
|
|
{
|
|
string * frame;
|
|
- string path = { 0 };
|
|
+ //Hibby - Attempting to solve this incompatible type error, see notes
|
|
+
|
|
+ Byte path[80];
|
|
string data= { 0 };
|
|
|
|
Byte pid, nr, ns, f_type, f_id, rpt, cr, pf;
|
|
@@ -385,8 +387,9 @@
|
|
{
|
|
optimize = TRUE;
|
|
frame = Strings(&AX25Sess->frame_buf, i);
|
|
-
|
|
- decode_frame(frame->Data, frame->Length, &path, &data, &pid, &nr, &ns, &f_type, &f_id, &rpt, &pf, &cr);
|
|
+ // Hibby - this alignes decode_frame with other uses in this
|
|
+ // file
|
|
+ decode_frame(frame->Data, frame->Length, path, &data, &pid, &nr, &ns, &f_type, &f_id, &rpt, &pf, &cr);
|
|
|
|
if (f_id == I_I)
|
|
{
|
|
--- a/SMMain.c
|
|
+++ b/SMMain.c
|
|
@@ -223,8 +223,8 @@
|
|
if (using48000)
|
|
{
|
|
// Need to upsample to 48K. Try just duplicating sample
|
|
-
|
|
- uint32_t * ptr = &DMABuffer[2 * Number];
|
|
+ // Hibby - explicitly cast short int to uint32_t
|
|
+ uint32_t * ptr = (uint32_t *)&DMABuffer[2 * Number];
|
|
|
|
*(&ptr[1]) = *(ptr);
|
|
*(&ptr[2]) = *(ptr);
|
|
@@ -388,7 +388,8 @@
|
|
#endif
|
|
|
|
extern int blnBusyStatus;
|
|
-BusyDet = 5;
|
|
+// Hibby - detail explicitly as int
|
|
+int BusyDet = 5;
|
|
|
|
#define PLOTWATERFALL
|
|
|