From 6f85879c00a0a1471405e67205751187b579b354 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 16 Dec 2008 09:30:21 -0500 Subject: fixes --- probe-modem/probe-modem.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'probe-modem/probe-modem.c') diff --git a/probe-modem/probe-modem.c b/probe-modem/probe-modem.c index 8ffe964..2d8f091 100644 --- a/probe-modem/probe-modem.c +++ b/probe-modem/probe-modem.c @@ -23,8 +23,6 @@ #include -#include "../../udev.h" - #define MODEM_CAP_GSM 0x0001 /* GSM */ #define MODEM_CAP_IS707_A 0x0002 /* CDMA Circuit Switched Data */ #define MODEM_CAP_IS707_P 0x0004 /* CDMA Packet Switched Data */ @@ -298,10 +296,10 @@ static int modem_probe_caps(int fd) return ret; } -void +static void print_usage (void) { - printf("Usage: modem_caps [options] \n" + printf("Usage: probe-modem [options] \n" " --export export key/value pairs\n" " --verbose print verbose debugging output\n" " --help\n\n"); @@ -318,10 +316,8 @@ main(int argc, char *argv[]) }; const char *device = NULL; - int i; gboolean export = 0; struct termios orig, attrs; - char *udi; int fd, caps; while (1) { @@ -389,7 +385,7 @@ main(int argc, char *argv[]) g_print ("ID_MODEM_GSM=1\n"); if (caps & MODEM_CAP_IS707_A) g_print ("ID_MODEM_IS707_A=1\n"); - if (caps & MODEM_CAP_IS707P) + if (caps & MODEM_CAP_IS707_P) g_print ("ID_MODEM_IS707P=1\n"); if (caps & MODEM_CAP_IS856) g_print ("ID_MODEM_IS856=1\n"); @@ -398,7 +394,7 @@ main(int argc, char *argv[]) } else { g_print ("%s: caps 0x%X%s%s%s%s\n", device, caps, caps & MODEM_CAP_GSM ? " GSM" : "", - caps & (MODEM_CAP_IS707_A | MODEM_CAP_IS707P) ? " CDMA-1x" : "", + caps & (MODEM_CAP_IS707_A | MODEM_CAP_IS707_P) ? " CDMA-1x" : "", caps & MODEM_CAP_IS856 ? " EVDOr0" : "", caps & MODEM_CAP_IS856_A ? " EVDOrA" : ""); } -- cgit