diff options
Diffstat (limited to 'scan/sane')
| -rw-r--r-- | scan/sane/hpaio.c | 8 | ||||
| -rw-r--r-- | scan/sane/hpaio.desc | 16 | ||||
| -rwxr-xr-x | scan/sane/io.h | 1 |
3 files changed, 22 insertions, 3 deletions
diff --git a/scan/sane/hpaio.c b/scan/sane/hpaio.c index 40bbcec32..ae34cfb63 100644 --- a/scan/sane/hpaio.c +++ b/scan/sane/hpaio.c @@ -45,6 +45,7 @@ #include "ledm.h" #include "sclpml.h" #include "escl.h" +#include "io.h" #define DEBUG_DECLARE_ONLY #include "sanei_debug.h" @@ -290,7 +291,7 @@ static int DevDiscovery(int localOnly) } if (cups_printer) free(cups_printer); - +#ifdef HAVE_LIBNETSNMP /* Discover NW scanners using Bonjour*/ bytes_read = mdns_probe_nw_scanners(message, sizeof(message), &cnt); token = strtok(message, ";"); @@ -299,6 +300,11 @@ static int DevDiscovery(int localOnly) total += AddDevice(token); token = strtok(NULL, ";"); } +#endif + if(!total) + { + SendScanEvent("hpaio:/net/HP_Scan_Devices?ip=1.1.1.1", EVENT_ERROR_NO_PROBED_DEVICES_FOUND); + } } bugout: diff --git a/scan/sane/hpaio.desc b/scan/sane/hpaio.desc index d4f2a4f7c..79fe65c90 100644 --- a/scan/sane/hpaio.desc +++ b/scan/sane/hpaio.desc @@ -715,6 +715,9 @@ :model "HP Deskjet Ink Advantage k209a All-in-one Printer" :status :good +:model "HP Deskjet Ink Advantage Ultra 2529 All-in-one Printer" +:status :good + :model "HP Deskjet Ink Advantage Ultra 4720 All-in-one Printer Series" :status :good @@ -814,7 +817,7 @@ :model "HP Envy 5540 All-in-one Printer Series" :status :good -:model "HP Envy 5542 All-in-one Printer" +:model "HP Envy 5542 E-all-in-one Printer" :status :good :model "HP Envy 5543 All-in-one Printer" @@ -823,7 +826,10 @@ :model "HP Envy 5544 All-in-one Printer" :status :good -:model "HP Envy 5545 All-in-one Printer" +:model "HP Envy 5545 E-all-in-one Printer" +:status :good + +:model "HP Envy 5546 All-in-one Printer" :status :good :model "HP Envy 5640 E-all-in-one" @@ -1186,6 +1192,9 @@ :model "HP LaserJet Pro MFP m127fp" :status :good +:model "HP LaserJet Pro MFP m127fs" +:status :good + :model "HP LaserJet Pro MFP m127fw" :status :good @@ -3265,3 +3274,6 @@ :model "HP Scanjet Pro 3500 f1 Flatbed Scanner" :status :good +:model "HP Scanjet Pro 4500 fn1" +:status :good + diff --git a/scan/sane/io.h b/scan/sane/io.h index f3f758145..be5481d02 100755 --- a/scan/sane/io.h +++ b/scan/sane/io.h @@ -49,6 +49,7 @@ int __attribute__ ((visibility ("hidden"))) ReadChannelEx(int deviceid, int chan #define EVENT_SCAN_ADF_NO_DOCS 2011 #define EVENT_SCAN_ADF_MISPICK 2012 #define EVENT_SCAN_BUSY 2013 +#define EVENT_ERROR_NO_PROBED_DEVICES_FOUND 5018 #define DBUS_INTERFACE "com.hplip.StatusService" #define DBUS_PATH "/" |