summaryrefslogtreecommitdiff
path: root/instr-daemon.c
diff options
context:
space:
mode:
authorroot <root@avtech.domain.avtechpulse.com>2000-01-01 00:30:55 +0900
committerroot <root@avtech.domain.avtechpulse.com>2000-01-01 00:30:55 +0900
commit3636beafd37af537f864fb898b7375626236d0a4 (patch)
tree2816b5af784be22458eaf25b126f96ff96feeddd /instr-daemon.c
parent93a0b81a4e630821392cb0f469ef8f3fbed46a3b (diff)
abstract the hardware identification checks
Diffstat (limited to 'instr-daemon.c')
-rw-r--r--instr-daemon.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/instr-daemon.c b/instr-daemon.c
index 4c72997..8b2d0e6 100644
--- a/instr-daemon.c
+++ b/instr-daemon.c
@@ -369,7 +369,7 @@ static gboolean finish_boot (void)
Show_Main_Menu();
// report error if GPIB chip not found
- if (!globals.HWDetect.gpib) {
+ if (!globals.HWDetect.has_gpib) {
queue_error_and_display_on_LCD(GPIB_missing);
}
@@ -380,12 +380,12 @@ static gboolean periodic_poll (void)
{
gboolean power_fail;
- power_fail = (globals.HWDetect.beaglebone && bus_getpin (POWER_FAIL));
+ power_fail = (globals.HWDetect.has_gpio && bus_getpin (POWER_FAIL));
if (power_fail) {
// verify after a short delay (25 ms), to ignore short power glitches
g_usleep (25e3);
- power_fail = (globals.HWDetect.beaglebone && bus_getpin (POWER_FAIL));
+ power_fail = (globals.HWDetect.has_gpio && bus_getpin (POWER_FAIL));
}
if (power_fail) {