hidups removal

Fossil-ID: SVN r704

ChangeLog

@@ -1,3 +1,15 @@
+Fri Jan  4 10:13:05 UTC 2007 / Arnaud Quette <[email protected]>
+
+ * final removal of the legacy hidups driver. It is now fully
+   replaced by the newhidups driver (soon to be renamed usbhid-ups).
+   Note that the hiddev code and macro is kept for energizerups
+   - drivers/hidups.*: removed
+   - drivers/Makefile.am: remove hidups references
+   - man/hidups.8: removed
+   - man/Makefile.am, man/nutupsdrv.8: remove hidups references
+   - man/newhidups.8: add a note for the replacement of hidups
+   - docs/FAQ, MAINTAINERS: few update
+
 Fri Jan  5 00:45:11 UTC 2007 / Charles Lepple <[email protected]>
 
  - drivers/optiups.c, man/optiups.8, data/driver.list: Added Matthias Goebl's

MAINTAINERS

@@ -35,10 +35,9 @@ S: Maintained: apcsmart, belkin, bestups, cyberpower, dummycons,
                fentonups, driver core (main.c), upsdrvctl
 
 P: Arnaud Quette
-M: [email protected]
+M: [email protected]
 M: [email protected]
-S: Maintained: hidparser, newhidups, hidups, mge-shut, mge-utalk,
-               snmp-ups
+S: Maintained: dummy-ups, newhidups, mge-shut, mge-utalk, snmp-ups
 
 P: Arjen de Korte
 M: [email protected]

docs/FAQ

@@ -56,9 +56,11 @@ Auth: Russell Kroll <[email protected]>
  Q: My favorite UPS driver disappeared after an upgrade.  What now?
 
  A: Drivers are occasionally removed from the tree if they are no longer
-    receiving maintenance.  There have been several architectural
-    changes to the driver code in recent times, and drivers which were
-    not converted by someone are eventually dropped.
+    receiving maintenance, or sometimes renamed to better reflect their
+    hardware support scope or replaced by a more generic driver.
+    There have been several architectural changes to the driver code
+    in recent times, and drivers which were not converted by someone
+    are eventually dropped.
 
     This is called progress.  We do this in order to avoid a situation
     where someone believes that a driver is being maintained when it is
@@ -633,25 +635,22 @@ Auth: Russell Kroll <[email protected]>
 
     Refer to the "driver-name" (8) manpage for more information.
 
-    Note that the previous experimental support through the hidups driver
-    will be dropped by NUT 2.2.
-
 -----------------------------------------------------------------------------
 
  Q: What is this newhidups about?
 
- A: The basic USB UPS support was done until now using hidups. To allow
-    a wider support accross platforms, newhidups driver uses libusb
-    (which is available for a wide range of operating systems) and
-    libhid (currently, an old internal version of it).
+ A: The basic USB UPS support was done until NUT 2.2 using hidups. To allow
+    a wider support accross platforms for USB/HID compliant devices,
+    newhidups driver uses libusb (which is available for a wide range of
+    operating systems) and libhid (currently, a modified internal version
+    of it).
 
-    As of NUT 2.2, newhidups will completely replace the existing
-    hidups driver and provide support for various manufacturers. At that
-    time, it will be renamed to usbhid-ups.
+    As of NUT 2.2, newhidups completely replaces the legacy hidups driver
+    and provide support for various manufacturers. At that time, it will
+    be renamed to usbhid-ups.
 
-    newhidups can be built by using "make usb", and installed using
-    "make install-usb". Note that it will also install other USB
-    drivers.
+    newhidups is built automatically if possible (libusb development files
+    need to be installed) and installed by the "make install" command.
 
 -----------------------------------------------------------------------------
 

docs/configure.txt

@@ -249,8 +249,8 @@ Contents:
 
    Sets the location of the hiddev.h for USB UPS support on Linux. 
    This defaults to /usr/include/linux/hiddev.h, and is only used when
-   building the experimental "hidups" driver.  If your kernel header
-   files live somewhere else, you will need to use this.
+   building the experimental "energizerups" driver.  If your kernel
+   header files live somewhere else, you will need to use this.
 
  --with-gd-includes="-I/foo/bar"
 

drivers/Makefile.am

@@ -21,7 +21,7 @@ SERIAL_DRIVERLIST = al175 apcsmart bcmxcp belkin belkinunv bestfcom	\
  tripplitesu upscode2 victronups powerpanel
 SNMP_DRIVERLIST = snmp-ups
 USB_LIBUSB_DRIVERLIST = newhidups bcmxcp_usb tripplite_usb
-USB_HIDDEV_DRIVERLIST = hidups energizerups
+USB_HIDDEV_DRIVERLIST = energizerups
 USB_DRIVERLIST = $(USB_LIBUSB_DRIVERLIST) $(USB_HIDDEV_DRIVERLIST)
 HAL_DRIVERLIST = hald-addon-usbhid-ups hald-addon-bcmxcp_usb hald-addon-tripplite_usb
 
@@ -124,9 +124,6 @@ newhidups_SOURCES = newhidups.c libhid.c libusb.c hidparser.c	\
 newhidups_CFLAGS = $(AM_CFLAGS) $(LIBUSB_CFLAGS)
 newhidups_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS)
 
-hidups_SOURCES = hidups.c
-hidups_LDADD = $(LDADD_DRIVERS)
-
 energizerups_SOURCES = energizerups.c
 energizerups_LDADD = $(LDADD_DRIVERS)
 
@@ -169,7 +166,7 @@ dist_noinst_HEADERS = al175.h apccmib.h apc-hid.h apcsmart.h bcmxcp.h	\
  bestuferrups.h bestups.h blazer.h cpsups.h cyberpower.h dstate.h	\
  dstate-hal.h								\
  dummy-ups.h esupssmart.h etapro.h everups.h fentonups.h gamatronic.h	\
- explore-hid.h genericups.h hidparser.h hidtypes.h hidups.h ietfmib.h	\
+ explore-hid.h genericups.h hidparser.h hidtypes.h ietfmib.h	\
  ippon.h isbmex.h libhid.h libshut.h libusb.h liebert.h main.h		\
  main-hal.h								\
  masterguard.h megatec.h metasys.h mge-hid.h mgemib.h mge-shut.h	\