Remove one of the adapter statuses

diff --git a/ajaxui/ajaxui_config_dvb.c b/ajaxui/ajaxui_config_dvb.c
index cdaee9850a038329bb74f853c8f3da17c86b20d6..6c66bc30164059c8f45c58128e6ba7e008f0a55b 100644 (file)
--- a/ajaxui/ajaxui_config_dvb.c
+++ b/ajaxui/ajaxui_config_dvb.c
@@ -39,9 +39,8 @@
 
 
 static struct strtab adapterstatus[] = {
-  { "Unconfigured",                   TDA_STATE_UNCONFIGURED },
-  { "Running",                        TDA_STATE_RUNNING },
-  { "Zombie",                         TDA_STATE_ZOMBIE },
+  { "Hardware detected",    TDA_STATE_RUNNING },
+  { "Hardware not found",   TDA_STATE_ZOMBIE },
 };
 
 static void
@@ -92,8 +91,6 @@ ajax_adaptersummary(http_connection_t *hc, const char *remain, void *opaque)
              "<div>%s</div>", 
              dvb_adaptertype_to_str(tda->tda_fe_info->type));
  
-  tcp_qprintf(&tq, "<div class=\"infoprefix\">Tuner:</div>"
-             "<div>...</div>");
   tcp_qprintf(&tq, "<div style=\"text-align: center\">"
              "<a href=\"javascript:void(0);\" "
              "onClick=\"new Ajax.Updater('dvbadaptereditor', "

diff --git a/dvb.c b/dvb.c
index 1b7c724e489aeae6f6a063b83aaf9111fa852415..ed2ef28a357f2c10805cd1f85d7345ecaaa944ae 100644 (file)
Binary files a/dvb.c and b/dvb.c differ

diff --git a/tvhead.h b/tvhead.h
index c0fbbea5bc87e93f9a2c4f74a8fe5533062147f2..9c8034a3b22fced7439d5eba922cdf1b2bc44856 100644 (file)
--- a/tvhead.h
+++ b/tvhead.h
@@ -208,8 +208,7 @@ typedef struct th_dvb_adapter {
   LIST_ENTRY(th_dvb_adapter) tda_global_link;
 
   enum {
-    TDA_STATE_UNCONFIGURED,    /* Found but not configured */
-    TDA_STATE_RUNNING,         /* Configured */
+    TDA_STATE_RUNNING,         /* Running */
     TDA_STATE_ZOMBIE,          /* Configured but not found */
   } tda_state;