67 lines
2.0 KiB
Diff
67 lines
2.0 KiB
Diff
diff --git a/src/axe.c b/src/axe.c
|
|
index 9383d7c..e999a53 100644
|
|
--- a/src/axe.c
|
|
+++ b/src/axe.c
|
|
@@ -48,7 +48,7 @@
|
|
|
|
#ifndef DISABLE_LINUXDVB
|
|
|
|
-void get_signal(adapter *ad, uint32_t *status, uint32_t *ber, uint16_t *strength, uint16_t *snr);
|
|
+void get_signal(adapter *ad, int *status, int *ber, int *strength, int *snr);
|
|
int send_jess(adapter *ad, int fd, int freq, int pos, int pol, int hiband, diseqc *d);
|
|
int send_unicable(adapter *ad, int fd, int freq, int pos, int pol, int hiband, diseqc *d);
|
|
int send_diseqc(adapter *ad, int fd, int pos, int pos_change, int pol, int hiband, diseqc *d);
|
|
@@ -819,9 +819,11 @@ void free_axe_input(adapter *ad)
|
|
|
|
for (aid = 0; aid < 4; aid++)
|
|
{
|
|
- ad2 = get_adapter(aid);
|
|
- if (ad2)
|
|
+ ad2 = get_configured_adapter(aid);
|
|
+ if (ad2) {
|
|
ad2->axe_used &= ~(1 << ad->id);
|
|
+ LOGM("axe: free input %d : %04x", ad2->id, ad2->axe_used);
|
|
+ }
|
|
}
|
|
}
|
|
|
|
diff --git a/src/minisatip.c b/src/minisatip.c
|
|
index 0f47290..909072a 100644
|
|
--- a/src/minisatip.c
|
|
+++ b/src/minisatip.c
|
|
@@ -551,7 +551,7 @@ void set_options(int argc, char *argv[])
|
|
#endif
|
|
#ifdef AXE
|
|
opts.no_threads = 1;
|
|
- opts.document_root = "/usr/share/minisatip/html";
|
|
+ opts.document_root = "/usr/share/minisatip8/html";
|
|
#define AXE_OPTS "7:QW:8:A:"
|
|
#else
|
|
#define AXE_OPTS ""
|
|
diff --git a/src/minisatip.h b/src/minisatip.h
|
|
index 3797f5a..0d73411 100644
|
|
--- a/src/minisatip.h
|
|
+++ b/src/minisatip.h
|
|
@@ -9,7 +9,7 @@
|
|
|
|
#define VERSION_BUILD "15"
|
|
#define CC(a, b, c) #a b #c
|
|
-#define VERSION CC(0.7., VERSION_BUILD, )
|
|
+#define VERSION CC(0.7., VERSION_BUILD, -axe207)
|
|
|
|
void set_options(int argc, char *argv[]);
|
|
|
|
diff --git a/src/stream.c b/src/stream.c
|
|
index 35102f4..c85a2d6 100644
|
|
--- a/src/stream.c
|
|
+++ b/src/stream.c
|
|
@@ -973,7 +973,7 @@ int process_dmx(sockets *s)
|
|
#endif
|
|
|
|
rlen = ad->rlen;
|
|
- int packet_no_sid = check_cc(ad);
|
|
+ const int packet_no_sid = 0 /* check_cc(ad) */;
|
|
|
|
if (ad->sid_cnt == 1 && ad->master_sid >= 0 && !packet_no_sid) // we have just 1 stream, do not check the pids, send everything to the destination
|
|
{
|