rpm/nut
SHA256
1
0
Fork 0
forked from pool/nut
Code Pull Requests Activity

- Patch real source files to get missing devices (bnc#719292#c7).

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/hardware/nut?expand=0&rev=23
This commit is contained in:
Stanislav Brabec
2011-11-02 17:47:00 +00:00
committed by Git OBS Bridge
parent 9a2af93034
commit d90a3b02d0
2 changed files with 59 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
nut-usb-ups-ids.patch
View File

@@ -1,36 +1,58 @@
Index: nut-2.6.2/scripts/udev/nut-usbups.rules.in
Index: nut-2.6.2/drivers/blazer_usb.c
===================================================================
--- nut-2.6.2.orig/scripts/udev/nut-usbups.rules.in
+++ nut-2.6.2/scripts/udev/nut-usbups.rules.in
@@ -54,6 +54,8 @@ ATTR{idVendor}=="050d", ATTR{idProduct}=
ATTR{idVendor}=="050d", ATTR{idProduct}=="0980", MODE="664", GROUP="@RUN_AS_GROUP@"
# F6C1100-UNV, F6C1200-UNV - usbhid-ups
ATTR{idVendor}=="050d", ATTR{idProduct}=="1100", MODE="664", GROUP="@RUN_AS_GROUP@"
+# Belkin F6C1200-UNV
+ATTR{idVendor}=="0665", ATTR{idProduct}=="5161", MODE="664", GROUP="@RUN_AS_GROUP@"
--- nut-2.6.2.orig/drivers/blazer_usb.c
+++ nut-2.6.2/drivers/blazer_usb.c
@@ -305,8 +305,8 @@ static void *phoenix_subdriver(void)
# APC
# various models - usbhid-ups
@@ -84,9 +86,9 @@ ATTR{idVendor}=="06da", ATTR{idProduct}=
ATTR{idVendor}=="075d", ATTR{idProduct}=="0300", MODE="664", GROUP="@RUN_AS_GROUP@"
static usb_device_id_t blazer_usb_id[] = {
{ USB_DEVICE(0x05b8, 0x0000), &cypress_subdriver }, /* Agiler UPS */
- { 0x0001, 0x0000, &krauler_subdriver }, /* Krauler UP-M500VA */
- { 0xffff, 0x0000, &krauler_subdriver }, /* Ablerex 625L USB */
+ { USB_DEVICE(0x0001, 0x0000), &krauler_subdriver }, /* Krauler UP-M500VA */
+ { USB_DEVICE(0xffff, 0x0000), &krauler_subdriver }, /* Ablerex 625L USB */
{ USB_DEVICE(0x0665, 0x5161), &cypress_subdriver }, /* Belkin F6C1200-UNV */
{ USB_DEVICE(0x06da, 0x0003), &ippon_subdriver }, /* Mustek Powermust */
{ USB_DEVICE(0x0f03, 0x0001), &cypress_subdriver }, /* Unitek Alpha 1200Sx */
Index: nut-2.6.2/drivers/belkin-hid.c
===================================================================
--- nut-2.6.2.orig/drivers/belkin-hid.c
+++ nut-2.6.2/drivers/belkin-hid.c
@@ -33,6 +33,9 @@
/* Belkin */
#define BELKIN_VENDORID 0x050d
# Cyber Power Systems
-# 900AVR/BC900D, CP1200AVR/BC1200D - usbhid-ups
+# 900AVR/BC900D - usbhid-ups
ATTR{idVendor}=="0764", ATTR{idProduct}=="0005", MODE="664", GROUP="@RUN_AS_GROUP@"
-# Dynex DX-800U? - usbhid-ups
+# CP1200AVR/BC1200D, Dynex DX-800U? - usbhid-ups
ATTR{idVendor}=="0764", ATTR{idProduct}=="0501", MODE="664", GROUP="@RUN_AS_GROUP@"
# OR2200LCDRM2U - usbhid-ups
ATTR{idVendor}=="0764", ATTR{idProduct}=="0601", MODE="664", GROUP="@RUN_AS_GROUP@"
@@ -177,4 +179,10 @@ ATTR{idVendor}=="10af", ATTR{idProduct}=
# GE EP series - blazer_usb
ATTR{idVendor}=="14f0", ATTR{idProduct}=="00c9", MODE="664", GROUP="@RUN_AS_GROUP@"
+# Krauler UP-M500VA - blazer_usb
+ATTR{idVendor}=="0001", ATTR{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
+/* Cypress Semiconductor */
+#define CYPRESS_VENDORID 0x0665
+
+# Ablerex 625L USB
+ATTR{idVendor}=="ffff", ATTR{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
+
LABEL="nut-usbups_rules_end"
/* Liebert */
#define LIEBERT_VENDORID 0x10af
@@ -54,9 +57,10 @@ static usb_device_id_t belkin_usb_device
{ USB_DEVICE(BELKIN_VENDORID, 0x0751), NULL },
/* F6H375-USB */
{ USB_DEVICE(BELKIN_VENDORID, 0x0375), NULL },
- /* F6C1100-UNV, F6C1200-UNV */
+ /* F6C1100-UNV */
{ USB_DEVICE(BELKIN_VENDORID, 0x1100), NULL },
-
+ /* F6C1200-UNV */
+ { USB_DEVICE(CYPRESS_VENDORID, 0x5161), NULL },
/* Liebert PowerSure PSA UPS */
{ USB_DEVICE(LIEBERT_VENDORID, 0x0001), NULL },
Index: nut-2.6.2/drivers/cps-hid.c
===================================================================
--- nut-2.6.2.orig/drivers/cps-hid.c
+++ nut-2.6.2/drivers/cps-hid.c
@@ -48,9 +48,9 @@ static void *cps_battery_scale(void)
/* USB IDs device table */
static usb_device_id_t cps_usb_device_table[] = {
- /* 900AVR/BC900D, CP1200AVR/BC1200D */
+ /* 900AVR/BC900D */
{ USB_DEVICE(CPS_VENDORID, 0x0005), NULL },
- /* Dynex DX-800U? */
+ /* CP1200AVR/BC1200D, Dynex DX-800U? */
{ USB_DEVICE(CPS_VENDORID, 0x0501), &cps_battery_scale },
/* OR2200LCDRM2U */
{ USB_DEVICE(CPS_VENDORID, 0x0601), NULL },

5
nut.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Nov 2 18:45:31 CET 2011 - sbrabec@suse.cz
- Patch real source files to get missing devices (bnc#719292#c7).
-------------------------------------------------------------------
Tue Nov 1 20:56:52 CET 2011 - sbrabec@suse.cz