Hello community,

here is the log from the commit of package hwinfo for openSUSE:Factory
checked in at Sat Oct 8 11:42:30 CEST 2011.



--------
--- openSUSE:Factory/hwinfo/hwinfo.changes      2011-09-23 02:03:02.000000000 
+0200
+++ hwinfo/hwinfo.changes       2011-10-07 15:20:51.000000000 +0200
@@ -1,0 +2,17 @@
+Fri Oct  7 15:13:16 CEST 2011 - [email protected]
+
+- fix network detection if several interfaces are attached to a single pci 
function (bnc #693090)
+- fixed typo
+- USB joystick fixes
+- replace USB details by joystick details
+- set unix_dev_name2 to /dev/input/jsX
+- added Gameport bus, detect gameport joysticks
+- cleanup - removed unused variables
+- added NULL checks
+- joystick: detect and report number of axes and buttons
+- added support for detecting USB joysticks
+- updated .gitignore
+- added .gitignore files
+- show disk capacity in GB
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  hwinfo-18.5.tar.bz2

New:
----
  hwinfo-19.0.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ hwinfo.spec ++++++
--- /var/tmp/diff_new_pack.EAqtVD/_old  2011-10-08 11:42:10.000000000 +0200
+++ /var/tmp/diff_new_pack.EAqtVD/_new  2011-10-08 11:42:10.000000000 +0200
@@ -33,9 +33,9 @@
 PreReq:         /sbin/ldconfig
 AutoReqProv:    on
 Summary:        Hardware Library
-Version:        18.5
+Version:        19.0
 Release:        1
-Source:         hwinfo-18.5.tar.bz2
+Source:         hwinfo-19.0.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description

++++++ hwinfo-18.5.tar.bz2 -> hwinfo-19.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/hwinfo-18.5/VERSION new/hwinfo-19.0/VERSION
--- old/hwinfo-18.5/VERSION     2011-03-11 11:43:19.000000000 +0100
+++ new/hwinfo-19.0/VERSION     2011-10-07 15:13:09.000000000 +0200
@@ -1 +1 @@
-18.5
+19.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/hwinfo-18.5/changelog new/hwinfo-19.0/changelog
--- old/hwinfo-18.5/changelog   2011-03-11 11:43:20.000000000 +0100
+++ new/hwinfo-19.0/changelog   2011-10-07 15:13:11.000000000 +0200
@@ -1,4 +1,21 @@
-2011-03-11:    HEAD
+2011-10-07:    19.0
+       - new new version
+       - new version
+       - fix network detection if several interfaces are attached to a single 
pci function (bnc #693090)
+       - fixed typo
+       - USB joystick fixes
+       - replace USB details by joystick details
+       - set unix_dev_name2 to /dev/input/jsX
+       - added Gameport bus, detect gameport joysticks
+       - cleanup - removed unused variables
+       - added NULL checks
+       - joystick: detect and report number of axes and buttons
+       - added support for detecting USB joysticks
+       - updated .gitignore
+       - added .gitignore files
+       - show disk capacity in GB
+
+2011-03-11:    18.5
        - check for battery, too, to decide on notebook (bnc #678456)
 
 2011-03-08:    18.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/hwinfo-18.5/src/.gitignore 
new/hwinfo-19.0/src/.gitignore
--- old/hwinfo-18.5/src/.gitignore      1970-01-01 01:00:00.000000000 +0100
+++ new/hwinfo-19.0/src/.gitignore      2011-10-07 15:13:02.000000000 +0200
@@ -0,0 +1,3 @@
+.lib
+libhd.a
+libhd.so*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/hwinfo-18.5/src/hd/.gitignore 
new/hwinfo-19.0/src/hd/.gitignore
--- old/hwinfo-18.5/src/hd/.gitignore   1970-01-01 01:00:00.000000000 +0100
+++ new/hwinfo-19.0/src/hd/.gitignore   2011-10-07 15:13:02.000000000 +0200
@@ -0,0 +1,3 @@
+*.o
+.depend
+version.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/hwinfo-18.5/src/hd/hd.c new/hwinfo-19.0/src/hd/hd.c
--- old/hwinfo-18.5/src/hd/hd.c 2011-02-16 14:19:01.000000000 +0100
+++ new/hwinfo-19.0/src/hd/hd.c 2011-10-07 15:13:02.000000000 +0200
@@ -1359,6 +1359,10 @@
     case hd_detail_ccw:
       free_mem(d->ccw.data);
       break;
+
+    case hd_detail_joystick:
+      free_mem(d->joystick.data);
+      break;
   }
 
   free_mem(d);
@@ -2319,6 +2323,7 @@
 
 void hd_log(hd_data_t *hd_data, char *buf, ssize_t len)
 {
+  if (!hd_data) return;
   ssize_t new_size;
   char *p;
 
@@ -2635,6 +2640,8 @@
  */
 void progress(hd_data_t *hd_data, unsigned pos, unsigned count, char *msg)
 {
+  if (!hd_data) return;
+
   char buf1[32], buf2[32], buf3[128], *fn;
 
   if(hd_data->shm.ok && hd_data->flags.forked) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/hwinfo-18.5/src/hd/hd.h new/hwinfo-19.0/src/hd/hd.h
--- old/hwinfo-18.5/src/hd/hd.h 2011-03-11 11:27:31.000000000 +0100
+++ new/hwinfo-19.0/src/hd/hd.h 2011-10-07 15:13:02.000000000 +0200
@@ -19,7 +19,7 @@
  */
 
 /** Interface version */
-#define HD_VERSION     18
+#define HD_VERSION     19
 
 /**
  * @defgroup DEBUGpub Debug flags
@@ -296,7 +296,7 @@
   /** outside the range of the PCI values */
   bus_ps2 = 0x80, bus_serial, bus_parallel, bus_floppy, bus_scsi, bus_ide, 
bus_usb,
   bus_adb, bus_raid, bus_sbus, bus_i2o, bus_vio, bus_ccw, bus_iucv, 
bus_ps3_system_bus,
-  bus_virtio, bus_ibmebus
+  bus_virtio, bus_ibmebus, bus_gameport
 } hd_bus_types_t;
 
 /** @} */
@@ -1273,6 +1273,13 @@
   unsigned char dev_model;
 } ccw_t;
 
+/**
+ * @brief Joystick details
+ */
+typedef struct joystick_s {
+  unsigned char buttons;
+  unsigned char axes;
+} joystick_t;
 
 /**
  * @brief special CDROM entry
@@ -2050,7 +2057,7 @@
   hd_detail_pci, hd_detail_usb, hd_detail_isapnp, hd_detail_cdrom,
   hd_detail_floppy, hd_detail_bios, hd_detail_cpu, hd_detail_prom,
   hd_detail_monitor, hd_detail_sys, hd_detail_scsi, hd_detail_devtree,
-  hd_detail_ccw
+  hd_detail_ccw, hd_detail_joystick
 } hd_detail_type_t;
 
 typedef struct {
@@ -2119,6 +2126,11 @@
   ccw_t *data;
 } hd_detail_ccw_t;
 
+typedef struct {
+  enum hd_detail_type type;
+  joystick_t *data;
+} hd_detail_joystick_t;
+
 typedef union {
   enum hd_detail_type type;
   hd_detail_pci_t pci;
@@ -2134,6 +2146,7 @@
   hd_detail_scsi_t scsi;
   hd_detail_devtree_t devtree;
   hd_detail_ccw_t ccw;
+  hd_detail_joystick_t joystick;
 } hd_detail_t;
 
 /** @} */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/hwinfo-18.5/src/hd/hdp.c new/hwinfo-19.0/src/hd/hdp.c
--- old/hwinfo-18.5/src/hd/hdp.c        2011-02-16 14:19:01.000000000 +0100
+++ new/hwinfo-19.0/src/hd/hdp.c        2011-10-07 15:13:02.000000000 +0200
@@ -662,12 +662,20 @@
               snprintf(b0, sizeof b0 - 1, "%"PRIu64, res->size.val1);
               snprintf(b1, sizeof b1 - 1, "%"PRIu64, res->size.val2);
           }
-          if(!res->size.val2)
+          if(!res->size.val2) {
             dump_line("Size: %s %s\n", b0, s);
-          else if(res->size.unit == size_unit_sectors)
+          }
+          else if(res->size.unit == size_unit_sectors) {
             dump_line("Size: %s %s a %s bytes\n", b0, s, b1);
-          else
+           dump_line(
+             "Capacity: %" PRIu64 " GB (%" PRIu64 " bytes)\n",
+             (res->size.val1 * res->size.val2) >> 30,
+             res->size.val1 * res->size.val2
+           );
+         }
+          else {
             dump_line("Size: %sx%s %s\n", b0, b1, s);
+          }
         }
         break;
 
@@ -802,6 +810,15 @@
     dump_line("Module Alias: \"%s\"\n", h->modalias);
   }
 
+  // print joystick details
+  if(h->detail && h->detail->type == hd_detail_joystick)
+  {
+    joystick_t *jt = h->detail->joystick.data;
+
+    dump_line("Buttons: %hhd\n", jt->buttons);
+    dump_line("Axes: %hhd\n", jt->axes);
+  }
+
   if(
     h->detail &&
     h->detail->type == hd_detail_monitor &&
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/hwinfo-18.5/src/hd/input.c 
new/hwinfo-19.0/src/hd/input.c
--- old/hwinfo-18.5/src/hd/input.c      2011-02-16 14:19:01.000000000 +0100
+++ new/hwinfo-19.0/src/hd/input.c      2011-10-07 15:13:02.000000000 +0200
@@ -22,7 +22,7 @@
 
 static void get_input_devices(hd_data_t *hd_data);
 static char *all_bits(char *str);
-static int test_bit(char *str, unsigned bit);
+static int test_bit(const char *str, unsigned bit);
 
 void hd_scan_input(hd_data_t *hd_data)
 {
@@ -44,6 +44,38 @@
   get_input_devices(hd_data);
 }
 
+// note: hd_data parameter is needed for ADD2LOG macro
+void add_joystick_details(hd_data_t *hd_data, hd_t *h, const char *key, const 
char *abso)
+{
+  // replace existing details
+  if (h->detail)
+  {
+    free_hd_detail(h->detail);
+  }
+
+  // add buttons and axis details
+  h->detail = new_mem(sizeof *h->detail);
+  h->detail->type = hd_detail_joystick;
+
+  joystick_t *jt = new_mem(sizeof jt);
+  unsigned u;
+
+  if(key) {
+    for(u = BTN_JOYSTICK; u < BTN_JOYSTICK + 16; u++) {
+      if(test_bit(key, u)) jt->buttons++;
+    }
+  }
+  ADD2LOG("  joystick buttons = %u\n", jt->buttons);
+
+  if(abso) {
+    for(u = ABS_X; u < ABS_VOLUME; u++) {
+      if(test_bit(abso, u)) jt->axes++;
+    }
+  }
+  ADD2LOG("  joystick axes = %u\n", jt->axes);
+
+  h->detail->joystick.data = jt;
+}
 
 #define INP_NAME       "N: Name="
 #define INP_HANDLERS   "H: Handlers="
@@ -56,7 +88,7 @@
   hd_t *hd;
   str_list_t *input, *sl, *sl1;
   char *s;
-  unsigned ok, u, is_mouse;
+  unsigned ok, u, is_mouse, is_joystick;
   unsigned bus, vendor, product, version;
   unsigned mouse_buttons, mouse_wheels;
   char *name = NULL, *handlers = NULL, *key = NULL, *rel = NULL, *abso = NULL;
@@ -100,12 +132,17 @@
         handler_list = hd_split(' ', handlers);
 
         is_mouse = strstr(handlers, "mouse") ? 1 : 0;
+        is_joystick = strstr(handlers, "js") ? 1 : 0;
+
         if(    // HP Virtual Management Device
           vendor == 0x03f0 &&
           product == 0x1126 &&
           mouse_buttons >= 3
         ) is_mouse = 1;
 
+        ADD2LOG("  is_mouse = %u\n", is_mouse);
+        ADD2LOG("  is_joystick = %u\n", is_joystick);
+
         if(bus == BUS_USB) {
           s = NULL;
           for(sl1 = handler_list; sl1; sl1 = sl1->next) {
@@ -114,13 +151,14 @@
               break;
             }
           }
-          if(!s && is_mouse) for(sl1 = handler_list; sl1; sl1 = sl1->next) {
+
+          if(!s && (is_mouse || is_joystick)) for(sl1 = handler_list; sl1; sl1 
= sl1->next) {
             if(sscanf(sl1->str, "event%u", &u) == 1) {
               str_printf(&s, 0, "/dev/input/event%u", u);
               break;
             }
           }
-          
+
           if(s) {
             for(hd = hd_data->hd; hd; hd = hd->next) {
               if(
@@ -128,13 +166,30 @@
                 (hd->unix_dev_name && !strcmp(hd->unix_dev_name, s))
               ) {
                 if(!hd->base_class.id) {
-                  hd->base_class.id = bc_mouse;
-                  hd->sub_class.id = sc_mou_usb;
+                 if (is_mouse)
+                 {
+                   hd->base_class.id = bc_mouse;
+                   hd->sub_class.id = sc_mou_usb;
+                 }
+                 else if (is_joystick)
+                 {
+                   hd->base_class.id = bc_joystick;
+                 }
                 }
-                hd_set_hw_class(hd, hw_mouse);
 
-                hd->compat_vendor.id = MAKE_ID(TAG_SPECIAL, 0x0210);
-                hd->compat_device.id = MAKE_ID(TAG_SPECIAL, (mouse_wheels << 
4) + mouse_buttons);
+               if (is_mouse)
+               {
+                 hd_set_hw_class(hd, hw_mouse);
+                  hd->compat_vendor.id = MAKE_ID(TAG_SPECIAL, 0x0210);
+                  hd->compat_device.id = MAKE_ID(TAG_SPECIAL, (mouse_wheels << 
4) + mouse_buttons);
+               }
+               else if (is_joystick)
+               {
+                 hd_set_hw_class(hd, hw_joystick);
+
+                 /* add buttons and axis details */
+                 add_joystick_details(hd_data, hd, key, abso);
+               }
 
                 if(hd->unix_dev_name) add_str_list(&hd->unix_dev_names, 
hd->unix_dev_name);
                 if(hd->unix_dev_name2) add_str_list(&hd->unix_dev_names, 
hd->unix_dev_name2);
@@ -144,8 +199,17 @@
                     str_printf(&s, 0, "/dev/input/event%u", u);
                     if(!search_str_list(hd->unix_dev_names, s)) 
add_str_list(&hd->unix_dev_names, s);
                     s = free_mem(s);
-                    break;
                   }
+                 /* add /dev/input/jsN joystick device name */
+                 else if (is_joystick)
+                 {
+                   if(sscanf(sl1->str, "js%u", &u) == 1) {
+                     str_printf(&s, 0, "/dev/input/js%u", u);
+                     if(!search_str_list(hd->unix_dev_names, s)) 
add_str_list(&hd->unix_dev_names, s);
+                     if(!hd->unix_dev_name2) hd->unix_dev_name2 = new_str(s);
+                     s = free_mem(s);
+                   }
+                 }
                 }
 
                 break;
@@ -157,6 +221,7 @@
 
         }
         else {
+         // keyboard
           if(search_str_list(handler_list, "kbd") && test_bit(key, KEY_1)) {
             hd = add_hd_entry(hd_data, __LINE__, 0);
             hd->base_class.id = bc_keyboard;
@@ -179,6 +244,7 @@
               }
             }
           }
+         // mouse
           else if(is_mouse) {
             hd = add_hd_entry(hd_data, __LINE__, 0);
 
@@ -241,6 +307,49 @@
               }
             }
           }
+         // joystick
+          else if(is_joystick) {
+            hd = add_hd_entry(hd_data, __LINE__, 0);
+
+            hd->vendor.id = MAKE_ID(0, vendor);
+            hd->device.id = MAKE_ID(0, product);
+
+           hd_set_hw_class(hd, hw_joystick);
+            hd->base_class.id = bc_joystick;
+            hd->device.name = new_str(name);
+
+           // gameport? (see <linux/input.h>)
+           if (bus == BUS_GAMEPORT) hd->bus.id = bus_gameport;
+
+           /* add buttons and axis details */
+           add_joystick_details(hd_data, hd, key, abso);
+
+           // add eventX device
+            for(sl1 = handler_list; sl1; sl1 = sl1->next) {
+              if(sscanf(sl1->str, "event%u", &u) == 1) {
+                str_printf(&hd->unix_dev_name, 0, "/dev/input/event%u", u);
+                dev_num.major = 13;
+                dev_num.minor = 64 + u;
+                hd->unix_dev_num = dev_num;
+                break;
+              }
+            }
+
+           // add jsX device
+            for(sl1 = handler_list; sl1; sl1 = sl1->next) {
+              if(sscanf(sl1->str, "js%u", &u) == 1) {
+                str_printf(&hd->unix_dev_name2, 0, "/dev/input/js%u", u);
+                break;
+              }
+            }
+
+            add_str_list(&hd->unix_dev_names, hd->unix_dev_name);
+            add_str_list(&hd->unix_dev_names, hd->unix_dev_name2);
+         }
+         else
+         {
+           ADD2LOG("unknown non-USB input device\n");
+         }
         }
 
         handler_list = free_str_list(handler_list);
@@ -322,7 +431,7 @@
 }
 
 
-int test_bit(char *str, unsigned bit)
+int test_bit(const char *str, unsigned bit)
 {
   size_t len, ofs;
   unsigned u, mask;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/hwinfo-18.5/src/hd/mdt.c new/hwinfo-19.0/src/hd/mdt.c
--- old/hwinfo-18.5/src/hd/mdt.c        2011-02-16 14:19:01.000000000 +0100
+++ new/hwinfo-19.0/src/hd/mdt.c        2011-10-07 15:13:02.000000000 +0200
@@ -464,7 +464,7 @@
   unsigned char buf2[0x100], tmp[0x100];
   unsigned u, ml;
   unsigned modelist[0x100];
-  unsigned bpp, fb, clock;
+  unsigned bpp;
   int res_bpp;
   vbe_mode_info_t *mi;
   char s[64];
@@ -614,12 +614,10 @@
           if(res_bpp < 0) res_bpp = 0;
       }
 
-      fb = 0;
       if(vbe->version >= 0x0200) {
         mi->fb_start = tmp[0x28] + (tmp[0x29] << 8) + (tmp[0x2a] << 16) + 
(tmp[0x2b] << 24);
       }
 
-      clock = 0;
       if(vbe->version >= 0x0300) {
         mi->pixel_clock = tmp[0x3e] + (tmp[0x3f] << 8) + (tmp[0x40] << 16) + 
(tmp[0x41] << 24);
       }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/hwinfo-18.5/src/hd/mouse.c 
new/hwinfo-19.0/src/hd/mouse.c
--- old/hwinfo-18.5/src/hd/mouse.c      2011-02-16 14:19:01.000000000 +0100
+++ new/hwinfo-19.0/src/hd/mouse.c      2011-10-07 15:13:02.000000000 +0200
@@ -572,10 +572,10 @@
 
 void setspeed(int fd, int new, int needtowrite, unsigned short flags)
 {
-  int i, err;
+  int i;
 
   for(i = 9600; i >= 1200; i >>= 1) {
-    err = _setspeed(fd, i, new, needtowrite, flags);
+    _setspeed(fd, i, new, needtowrite, flags);
 #if 0
     if(err) {
       fprintf(stderr, "%d, %d ", i, err);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/hwinfo-18.5/src/hd/net.c new/hwinfo-19.0/src/hd/net.c
--- old/hwinfo-18.5/src/hd/net.c        2011-02-16 14:10:05.000000000 +0100
+++ new/hwinfo-19.0/src/hd/net.c        2011-10-07 15:13:02.000000000 +0200
@@ -51,7 +51,7 @@
   int if_type, if_carrier;
   hd_t *hd, *hd_card;
   char *s, *t, *hw_addr;
-  hd_res_t *res, *res1, *res2;
+  hd_res_t *res, *res1;
   uint64_t ul0;
   str_list_t *sf_class, *sf_class_e;
   char *sf_cdev = NULL, *sf_dev = NULL;
@@ -133,7 +133,6 @@
       add_res_entry(&hd->res, res1);
     }
 
-    res2 = NULL;
     if(if_carrier >= 0) {
       res = new_mem(sizeof *res);
       res->link.type = res_link;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/hwinfo-18.5/src/hd/pci.c new/hwinfo-19.0/src/hd/pci.c
--- old/hwinfo-18.5/src/hd/pci.c        2011-02-16 14:19:01.000000000 +0100
+++ new/hwinfo-19.0/src/hd/pci.c        2011-10-07 15:13:02.000000000 +0200
@@ -310,6 +310,7 @@
   pci_t *pci, *pnext;
   unsigned u;
   char *s, *t;
+  str_list_t *net_ifs;
 
   PROGRESS(4, 0, "build list");
 
@@ -333,6 +334,40 @@
       hd->base_class.id = u >> 8;
       hd->sub_class.id = u & 0xff;
     }
+
+    /*
+     * If there are several network interfaces attached to a single
+     * function, just replicate entries.
+     */
+
+    s = NULL;
+    str_printf(&s, 0, "/sys%s/net", hd->sysfs_id);
+    net_ifs = read_dir(s, 'D');
+    s = free_mem(s);
+
+    if(net_ifs) {
+      hd->unix_dev_name = new_str(net_ifs->str);
+      net_ifs = net_ifs->next;
+
+      for(; net_ifs; net_ifs = net_ifs->next) {
+        hd2 = add_hd_entry(hd_data, __LINE__, 0);
+        hd2->sysfs_id = new_str(hd->sysfs_id);
+        if(hd->drivers) {
+          add_str_list(&hd2->drivers, hd->drivers->str);
+        }
+        hd2->unix_dev_name = new_str(net_ifs->str);
+        hd2->detail = hd->detail;
+        hd_pci_complete_data(hd2);
+        hd2->detail = NULL;
+
+        if((u = device_class(hd_data, hd2->vendor.id, hd2->device.id))) {
+          hd2->base_class.id = u >> 8;
+          hd2->sub_class.id = u & 0xff;
+        }
+      }
+    }
+
+    free_str_list(net_ifs);
   }
 
   hd_data->pci = NULL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/hwinfo-18.5/src/hd/usb.c new/hwinfo-19.0/src/hd/usb.c
--- old/hwinfo-18.5/src/hd/usb.c        2011-03-08 11:11:44.000000000 +0100
+++ new/hwinfo-19.0/src/hd/usb.c        2011-10-07 15:13:02.000000000 +0200
@@ -763,7 +763,6 @@
   char *s;
   char buf[1024];
   int fd, two_ints[2];
-  unsigned bus;
   str_list_t *sl0, *sl;
   char *vend, *prod, *serial, *descr;
 
@@ -775,7 +774,6 @@
   }
   
   ADD2LOG("  usb/lp: bus = %d, dev_nr = %d\n", two_ints[0], two_ints[1]);
-  bus = ((two_ints[0] & 0xff) << 8) + (two_ints[1] & 0xff);
 
   if(ioctl(fd, LPIOC_GET_VID_PID(sizeof two_ints), two_ints) != -1) {
     /* just for the record */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/hwinfo-18.5/src/ids/.gitignore 
new/hwinfo-19.0/src/ids/.gitignore
--- old/hwinfo-18.5/src/ids/.gitignore  1970-01-01 01:00:00.000000000 +0100
+++ new/hwinfo-19.0/src/ids/.gitignore  2011-10-07 15:13:02.000000000 +0200
@@ -0,0 +1,6 @@
+.depend
+check_hd
+hd.ids
+hd_ids.h
+hd_ids_tiny.h
+hd_tiny.ids
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/hwinfo-18.5/src/ids/src/bus 
new/hwinfo-19.0/src/ids/src/bus
--- old/hwinfo-18.5/src/ids/src/bus     2011-02-16 14:10:05.000000000 +0100
+++ new/hwinfo-19.0/src/ids/src/bus     2011-10-07 15:13:02.000000000 +0200
@@ -85,3 +85,6 @@
  bus.id                        0x90
 +bus.name              IBMEBUS
 
+ bus.id                        0x91
++bus.name              Gameport
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/hwinfo-18.5/src/isdn/.gitignore 
new/hwinfo-19.0/src/isdn/.gitignore
--- old/hwinfo-18.5/src/isdn/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/hwinfo-19.0/src/isdn/.gitignore 2011-10-07 15:13:02.000000000 +0200
@@ -0,0 +1 @@
+.depend
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/hwinfo-18.5/src/isdn/cdb/.gitignore 
new/hwinfo-19.0/src/isdn/cdb/.gitignore
--- old/hwinfo-18.5/src/isdn/cdb/.gitignore     1970-01-01 01:00:00.000000000 
+0100
+++ new/hwinfo-19.0/src/isdn/cdb/.gitignore     2011-10-07 15:13:03.000000000 
+0200
@@ -0,0 +1,6 @@
+ISDN.CDB.hwdb
+ISDN.CDB.txt
+isdn_cdb
+isdn_cdb.h
+lex.yy.c
+mk_isdnhwdb

continue with "q"...



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to