Commit bc928f7a authored by Richard Hughes's avatar Richard Hughes

trivial: switch to using the new udev attribute names (no ABI or API break)

parent c8cec18f
......@@ -2,60 +2,60 @@
# Battery recall notices: Dell
#
# These are properties defining the behavior:
# DKP_RECALL_NOTICE
# DKP_RECALL_VENDOR
# DKP_RECALL_URL
# UPOWER_RECALL_NOTICE
# UPOWER_RECALL_VENDOR
# UPOWER_RECALL_URL
#
# only match power_supply devices
SUBSYSTEM!="power_supply", GOTO="dkp_battery_recall_dell_end"
SUBSYSTEM!="power_supply", GOTO="up_battery_recall_dell_end"
# only match batteries
ATTR{type}!="Battery", GOTO="dkp_battery_recall_dell_end"
ATTR{type}!="Battery", GOTO="up_battery_recall_dell_end"
# only match correct manufacturer
ATTR{manufacturer}!="Dell", GOTO="dkp_battery_recall_dell_end"
ATTR{manufacturer}!="Dell", GOTO="up_battery_recall_dell_end"
ATTR{model_name}=="1K055", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="C5446", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="F2100", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="KD494", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="W5915", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="Y1333", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="3K590", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="C6269", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="F5132", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="OR331", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="X5308", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="Y4500", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="5P474", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="C6270", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="GD785", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="M3006", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="X5329", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="Y5466", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="6P922", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="D2961", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="H3191", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="RD857", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="X5332", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="C2603", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="D5555", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="J1524", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="TD349", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="X5333", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="C5339", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="D6024", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="JD616", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="U5867", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="X5875", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="C5340", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="D6025", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="JD617", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="U5882", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="X5877", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="1K055", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="C5446", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="F2100", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="KD494", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="W5915", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="Y1333", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="3K590", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="C6269", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="F5132", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="OR331", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="X5308", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="Y4500", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="5P474", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="C6270", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="GD785", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="M3006", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="X5329", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="Y5466", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="6P922", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="D2961", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="H3191", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="RD857", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="X5332", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="C2603", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="D5555", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="J1524", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="TD349", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="X5333", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="C5339", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="D6024", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="JD616", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="U5867", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="X5875", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="C5340", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="D6025", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="JD617", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="U5882", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="X5877", ENV{UPOWER_RECALL_NOTICE}="1"
ENV{DKP_RECALL_NOTICE}=="1", ENV{DKP_RECALL_VENDOR}="Dell", ENV{DKP_RECALL_URL}="https://www.dellbatteryprogram.com"
ENV{UPOWER_RECALL_NOTICE}=="1", ENV{UPOWER_RECALL_VENDOR}="Dell", ENV{UPOWER_RECALL_URL}="https://www.dellbatteryprogram.com"
LABEL="dkp_battery_recall_dell_end"
LABEL="up_battery_recall_dell_end"
......@@ -2,30 +2,30 @@
# Battery recall notices: Fujitsu
#
# These are properties defining the behavior:
# DKP_RECALL_NOTICE
# DKP_RECALL_VENDOR
# DKP_RECALL_URL
# UPOWER_RECALL_NOTICE
# UPOWER_RECALL_VENDOR
# UPOWER_RECALL_URL
#
# only match power_supply devices
SUBSYSTEM!="power_supply", GOTO="dkp_battery_recall_fujitsu_end"
SUBSYSTEM!="power_supply", GOTO="up_battery_recall_fujitsu_end"
# only match batteries
ATTR{type}!="Battery", GOTO="dkp_battery_recall_fujitsu_end"
ATTR{type}!="Battery", GOTO="up_battery_recall_fujitsu_end"
# only match correct manufacturer
ATTR{manufacturer}!="Fujitsu", GOTO="dkp_battery_recall_fujitsu_end"
ATTR{manufacturer}!="Fujitsu", GOTO="up_battery_recall_fujitsu_end"
ATTR{model_name}=="CP255100", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="CP255108", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="CP229720", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="CP229725", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="CP234003", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="CP234019", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="CP283030", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="CP267910", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="CP255100", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="CP255108", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="CP229720", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="CP229725", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="CP234003", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="CP234019", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="CP283030", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="CP267910", ENV{UPOWER_RECALL_NOTICE}="1"
ENV{DKP_RECALL_NOTICE}=="1", ENV{DKP_RECALL_VENDOR}="Fujitsu", ENV{DKP_RECALL_URL}="http://www.computers.us.fujitsu.com/battery/"
ENV{UPOWER_RECALL_NOTICE}=="1", ENV{UPOWER_RECALL_VENDOR}="Fujitsu", ENV{UPOWER_RECALL_URL}="http://www.computers.us.fujitsu.com/battery/"
LABEL="dkp_battery_recall_fujitsu_end"
LABEL="up_battery_recall_fujitsu_end"
......@@ -2,27 +2,27 @@
# Battery recall notices: Gateway
#
# These are properties defining the behavior:
# DKP_RECALL_NOTICE
# DKP_RECALL_VENDOR
# DKP_RECALL_URL
# UPOWER_RECALL_NOTICE
# UPOWER_RECALL_VENDOR
# UPOWER_RECALL_URL
#
# only match power_supply devices
SUBSYSTEM!="power_supply", GOTO="dkp_battery_recall_gateway_end"
SUBSYSTEM!="power_supply", GOTO="up_battery_recall_gateway_end"
# only match batteries
ATTR{type}!="Battery", GOTO="dkp_battery_recall_gateway_end"
ATTR{type}!="Battery", GOTO="up_battery_recall_gateway_end"
# only match correct manufacturer
ATTR{manufacturer}!="Gateway", GOTO="dkp_battery_recall_gateway_end"
ATTR{manufacturer}!="Gateway", GOTO="up_battery_recall_gateway_end"
ATTR{model_name}=="916C4610F", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="916C4720F", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="916C4730F", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="916C5010F", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="W230", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="916C4610F", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="916C4720F", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="916C4730F", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="916C5010F", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="W230", ENV{UPOWER_RECALL_NOTICE}="1"
ENV{DKP_RECALL_NOTICE}=="1", ENV{DKP_RECALL_VENDOR}="Gateway", ENV{DKP_RECALL_URL}="http://www.gateway.com/battery/\n"
ENV{UPOWER_RECALL_NOTICE}=="1", ENV{UPOWER_RECALL_VENDOR}="Gateway", ENV{UPOWER_RECALL_URL}="http://www.gateway.com/battery/\n"
LABEL="dkp_battery_recall_gateway_end"
LABEL="up_battery_recall_gateway_end"
......@@ -2,37 +2,37 @@
# Battery recall notices: IBM
#
# These are properties defining the behavior:
# DKP_RECALL_NOTICE
# DKP_RECALL_VENDOR
# DKP_RECALL_URL
# UPOWER_RECALL_NOTICE
# UPOWER_RECALL_VENDOR
# UPOWER_RECALL_URL
#
# only match power_supply devices
SUBSYSTEM!="power_supply", GOTO="dkp_battery_recall_ibm_end"
SUBSYSTEM!="power_supply", GOTO="up_battery_recall_ibm_end"
# only match batteries
ATTR{type}!="Battery", GOTO="dkp_battery_recall_ibm_end"
ATTR{type}!="Battery", GOTO="up_battery_recall_ibm_end"
# only match correct manufacturer
ATTR{manufacturer}!="SONY", GOTO="dkp_battery_recall_ibm_end"
ATTR{manufacturer}!="SONY", GOTO="up_battery_recall_ibm_end"
# only recalled on some particular models
ATTR{[dmi/id]product_version}!="*R60*|*T60*|*Z60m*|*Z61e*|*Z61m*|*Z61p*", GOTO="dkp_battery_recall_ibm_end"
ATTR{model_name}=="92P1072", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="92P1073", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="92P1088", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="92P1089", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="92P1142", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="92P1141", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="92P1170", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="92P1169", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="93P5028", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="92P1174", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="92P1173", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="93P5030", ENV{DKP_RECALL_NOTICE}="1"
ENV{DKP_RECALL_NOTICE}=="1", ENV{DKP_RECALL_VENDOR}="LENOVO", ENV{DKP_RECALL_URL}="http://www.lenovo.com/batteryprogram"
LABEL="dkp_battery_recall_ibm_end"
ATTR{[dmi/id]product_version}!="*R60*|*T60*|*Z60m*|*Z61e*|*Z61m*|*Z61p*", GOTO="up_battery_recall_ibm_end"
ATTR{model_name}=="92P1072", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="92P1073", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="92P1088", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="92P1089", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="92P1142", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="92P1141", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="92P1170", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="92P1169", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="93P5028", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="92P1174", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="92P1173", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="93P5030", ENV{UPOWER_RECALL_NOTICE}="1"
ENV{UPOWER_RECALL_NOTICE}=="1", ENV{UPOWER_RECALL_VENDOR}="LENOVO", ENV{UPOWER_RECALL_URL}="http://www.lenovo.com/batteryprogram"
LABEL="up_battery_recall_ibm_end"
......@@ -2,23 +2,23 @@
# Battery recall notices: Lenovo
#
# These are properties defining the behavior:
# DKP_RECALL_NOTICE
# DKP_RECALL_VENDOR
# DKP_RECALL_URL
# UPOWER_RECALL_NOTICE
# UPOWER_RECALL_VENDOR
# UPOWER_RECALL_URL
#
# only match power_supply devices
SUBSYSTEM!="power_supply", GOTO="dkp_battery_recall_lenovo_end"
SUBSYSTEM!="power_supply", GOTO="up_battery_recall_lenovo_end"
# only match batteries
ATTR{type}!="Battery", GOTO="dkp_battery_recall_lenovo_end"
ATTR{type}!="Battery", GOTO="up_battery_recall_lenovo_end"
# only match correct manufacturer
ATTR{manufacturer}!="SANYO", GOTO="dkp_battery_recall_lenovo_end"
ATTR{manufacturer}!="SANYO", GOTO="up_battery_recall_lenovo_end"
ATTR{model_name}=="92P1131", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="92P1131", ENV{UPOWER_RECALL_NOTICE}="1"
ENV{DKP_RECALL_NOTICE}=="1", ENV{DKP_RECALL_VENDOR}="LENOVO", ENV{DKP_RECALL_URL}="http://www.lenovo.com/batteryprogram"
ENV{UPOWER_RECALL_NOTICE}=="1", ENV{UPOWER_RECALL_VENDOR}="LENOVO", ENV{UPOWER_RECALL_URL}="http://www.lenovo.com/batteryprogram"
LABEL="dkp_battery_recall_lenovo_end"
LABEL="up_battery_recall_lenovo_end"
......@@ -2,28 +2,28 @@
# Battery recall notices: Toshiba
#
# These are properties defining the behavior:
# DKP_RECALL_NOTICE
# DKP_RECALL_VENDOR
# DKP_RECALL_URL
# UPOWER_RECALL_NOTICE
# UPOWER_RECALL_VENDOR
# UPOWER_RECALL_URL
#
# only match power_supply devices
SUBSYSTEM!="power_supply", GOTO="dkp_battery_recall_toshiba_end"
SUBSYSTEM!="power_supply", GOTO="up_battery_recall_toshiba_end"
# only match batteries
ATTR{type}!="Battery", GOTO="dkp_battery_recall_toshiba_end"
ATTR{type}!="Battery", GOTO="up_battery_recall_toshiba_end"
# only match correct manufacturer
ATTR{manufacturer}!="TOSHIBA", GOTO="dkp_battery_recall_toshiba_end"
ATTR{manufacturer}!="TOSHIBA", GOTO="up_battery_recall_toshiba_end"
ATTR{model_name}=="PA3465U", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="PA3399U", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="PA3400U", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="PA3465U", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="PA3399U", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="PA3400U", ENV{DKP_RECALL_NOTICE}="1"
ATTR{model_name}=="PA3465U", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="PA3399U", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="PA3400U", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="PA3465U", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="PA3399U", ENV{UPOWER_RECALL_NOTICE}="1"
ATTR{model_name}=="PA3400U", ENV{UPOWER_RECALL_NOTICE}="1"
ENV{DKP_RECALL_NOTICE}=="1", ENV{DKP_RECALL_VENDOR}="Toshiba", ENV{DKP_RECALL_URL}="http://bxinfo.toshiba.com/"
ENV{UPOWER_RECALL_NOTICE}=="1", ENV{UPOWER_RECALL_VENDOR}="Toshiba", ENV{UPOWER_RECALL_URL}="http://bxinfo.toshiba.com/"
LABEL="dkp_battery_recall_toshiba_end"
LABEL="up_battery_recall_toshiba_end"
......@@ -2,21 +2,21 @@
# Logitech Mice with CSR battery readouts
#
# These are properties defining the behavior:
# DKP_CSR_DUAL (Dual Receiver)
# UPOWER_CSR_DUAL (Dual Receiver)
#
SUBSYSTEM!="usb", GOTO="dkp_csr_end"
SUBSYSTEM!="usb", GOTO="up_csr_end"
ATTR{idVendor}=="046d", ENV{DKP_VENDOR}="Logitech, Inc."
ATTR{idVendor}=="046d", ATTR{idProduct}=="c501", ENV{DKP_PRODUCT}="Mouse Receiver", ENV{DKP_BATTERY_TYPE}="mouse"
ATTR{idVendor}=="046d", ATTR{idProduct}=="c502", ENV{DKP_PRODUCT}="Dual Receiver", ENV{DKP_BATTERY_TYPE}="mouse", ENV{DKP_CSR_DUAL}="1"
ATTR{idVendor}=="046d", ATTR{idProduct}=="c504", ENV{DKP_PRODUCT}="Freedom Optical", ENV{DKP_BATTERY_TYPE}="mouse", ENV{DKP_CSR_DUAL}="1"
ATTR{idVendor}=="046d", ATTR{idProduct}=="c505", ENV{DKP_PRODUCT}="Elite Duo", ENV{DKP_BATTERY_TYPE}="keyboard"
ATTR{idVendor}=="046d", ATTR{idProduct}=="c506", ENV{DKP_PRODUCT}="MX700 Optical Mouse", ENV{DKP_BATTERY_TYPE}="mouse"
ATTR{idVendor}=="046d", ATTR{idProduct}=="c508", ENV{DKP_PRODUCT}="Optical TrackMan", ENV{DKP_BATTERY_TYPE}="mouse"
ATTR{idVendor}=="046d", ATTR{idProduct}=="c50e", ENV{DKP_PRODUCT}="MX1000 Laser Mouse", ENV{DKP_BATTERY_TYPE}="mouse"
ATTR{idVendor}=="046d", ATTR{idProduct}=="c510", ENV{DKP_PRODUCT}="Click! Mouse", ENV{DKP_BATTERY_TYPE}="mouse"
ATTR{idVendor}=="046d", ATTR{idProduct}=="c512", ENV{DKP_PRODUCT}="Keyboard+Mouse Receiver", ENV{DKP_BATTERY_TYPE}="keyboard"
ATTR{idVendor}=="046d", ATTR{idProduct}=="c702", ENV{DKP_PRODUCT}="Presenter", ENV{DKP_BATTERY_TYPE}="mouse"
ATTR{idVendor}=="046d", ENV{UPOWER_VENDOR}="Logitech, Inc."
ATTR{idVendor}=="046d", ATTR{idProduct}=="c501", ENV{UPOWER_PRODUCT}="Mouse Receiver", ENV{UPOWER_BATTERY_TYPE}="mouse"
ATTR{idVendor}=="046d", ATTR{idProduct}=="c502", ENV{UPOWER_PRODUCT}="Dual Receiver", ENV{UPOWER_BATTERY_TYPE}="mouse", ENV{UPOWER_CSR_DUAL}="1"
ATTR{idVendor}=="046d", ATTR{idProduct}=="c504", ENV{UPOWER_PRODUCT}="Freedom Optical", ENV{UPOWER_BATTERY_TYPE}="mouse", ENV{UPOWER_CSR_DUAL}="1"
ATTR{idVendor}=="046d", ATTR{idProduct}=="c505", ENV{UPOWER_PRODUCT}="Elite Duo", ENV{UPOWER_BATTERY_TYPE}="keyboard"
ATTR{idVendor}=="046d", ATTR{idProduct}=="c506", ENV{UPOWER_PRODUCT}="MX700 Optical Mouse", ENV{UPOWER_BATTERY_TYPE}="mouse"
ATTR{idVendor}=="046d", ATTR{idProduct}=="c508", ENV{UPOWER_PRODUCT}="Optical TrackMan", ENV{UPOWER_BATTERY_TYPE}="mouse"
ATTR{idVendor}=="046d", ATTR{idProduct}=="c50e", ENV{UPOWER_PRODUCT}="MX1000 Laser Mouse", ENV{UPOWER_BATTERY_TYPE}="mouse"
ATTR{idVendor}=="046d", ATTR{idProduct}=="c510", ENV{UPOWER_PRODUCT}="Click! Mouse", ENV{UPOWER_BATTERY_TYPE}="mouse"
ATTR{idVendor}=="046d", ATTR{idProduct}=="c512", ENV{UPOWER_PRODUCT}="Keyboard+Mouse Receiver", ENV{UPOWER_BATTERY_TYPE}="keyboard"
ATTR{idVendor}=="046d", ATTR{idProduct}=="c702", ENV{UPOWER_PRODUCT}="Presenter", ENV{UPOWER_BATTERY_TYPE}="mouse"
LABEL="dkp_csr_end"
LABEL="up_csr_end"
......@@ -4,79 +4,79 @@
# to keep up to date, monitor: http://svn.debian.org/wsvn/nut/trunk/scripts/dkp/95-devkit-power-hid.rules
# only support USB, else ignore
SUBSYSTEM!="usb", GOTO="dkp_hid_end"
SUBSYSTEM!="usb", GOTO="up_hid_end"
# if usbraw device, ignore
KERNEL!="hiddev*", GOTO="dkp_hid_end"
KERNEL!="hiddev*", GOTO="up_hid_end"
# if an interface, ignore
ENV{DEVTYPE}=="usb_interface", GOTO="dkp_hid_end"
ATTRS{idVendor}=="03f0", ENV{DKP_VENDOR}="Hewlett Packard"
ATTRS{idVendor}=="0463", ENV{DKP_VENDOR}="Eaton"
ATTRS{idVendor}=="047c", ENV{DKP_VENDOR}="Dell"
ATTRS{idVendor}=="050d", ENV{DKP_VENDOR}="Belkin"
ATTRS{idVendor}=="051d", ENV{DKP_VENDOR}="APC"
ATTRS{idVendor}=="06da", ENV{DKP_VENDOR}="Liebert"
ATTRS{idVendor}=="0764", ENV{DKP_VENDOR}="Cyber Power Systems"
ATTRS{idVendor}=="09ae", ENV{DKP_VENDOR}="TrippLite"
ATTRS{idVendor}=="0d9f", ENV{DKP_VENDOR}="PowerCOM"
ATTRS{idVendor}=="10af", ENV{DKP_VENDOR}="Liebert"
ENV{DEVTYPE}=="usb_interface", GOTO="up_hid_end"
ATTRS{idVendor}=="03f0", ENV{UPOWER_VENDOR}="Hewlett Packard"
ATTRS{idVendor}=="0463", ENV{UPOWER_VENDOR}="Eaton"
ATTRS{idVendor}=="047c", ENV{UPOWER_VENDOR}="Dell"
ATTRS{idVendor}=="050d", ENV{UPOWER_VENDOR}="Belkin"
ATTRS{idVendor}=="051d", ENV{UPOWER_VENDOR}="APC"
ATTRS{idVendor}=="06da", ENV{UPOWER_VENDOR}="Liebert"
ATTRS{idVendor}=="0764", ENV{UPOWER_VENDOR}="Cyber Power Systems"
ATTRS{idVendor}=="09ae", ENV{UPOWER_VENDOR}="TrippLite"
ATTRS{idVendor}=="0d9f", ENV{UPOWER_VENDOR}="PowerCOM"
ATTRS{idVendor}=="10af", ENV{UPOWER_VENDOR}="Liebert"
# Hewlett Packard
ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1f06", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1f0a", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1f06", ENV{UPOWER_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1f0a", ENV{UPOWER_BATTERY_TYPE}="ups"
# Eaton
ATTRS{idVendor}=="0463", ATTRS{idProduct}=="0001", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="0463", ATTRS{idProduct}=="ffff", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="0463", ATTRS{idProduct}=="0001", ENV{UPOWER_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="0463", ATTRS{idProduct}=="ffff", ENV{UPOWER_BATTERY_TYPE}="ups"
# Dell
ATTRS{idVendor}=="047c", ATTRS{idProduct}=="ffff", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="047c", ATTRS{idProduct}=="ffff", ENV{UPOWER_BATTERY_TYPE}="ups"
# Belkin
ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0375", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0551", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0750", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0751", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0900", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0910", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0912", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0980", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="050d", ATTRS{idProduct}=="1100", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0375", ENV{UPOWER_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0551", ENV{UPOWER_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0750", ENV{UPOWER_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0751", ENV{UPOWER_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0900", ENV{UPOWER_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0910", ENV{UPOWER_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0912", ENV{UPOWER_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0980", ENV{UPOWER_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="050d", ATTRS{idProduct}=="1100", ENV{UPOWER_BATTERY_TYPE}="ups"
# APC
ATTRS{idVendor}=="051d", ATTRS{idProduct}=="0002", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="051d", ATTRS{idProduct}=="0002", ENV{UPOWER_BATTERY_TYPE}="ups"
# Liebert
ATTRS{idVendor}=="06da", ATTRS{idProduct}=="ffff", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="06da", ATTRS{idProduct}=="ffff", ENV{UPOWER_BATTERY_TYPE}="ups"
# Cyber Power Systems
ATTRS{idVendor}=="0764", ATTRS{idProduct}=="0005", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="0764", ATTRS{idProduct}=="0501", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="0764", ATTRS{idProduct}=="0601", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="0764", ATTRS{idProduct}=="0005", ENV{UPOWER_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="0764", ATTRS{idProduct}=="0501", ENV{UPOWER_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="0764", ATTRS{idProduct}=="0601", ENV{UPOWER_BATTERY_TYPE}="ups"
# TrippLite
ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="1003", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="1007", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="1008", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="2005", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="2007", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="3012", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="3014", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="4001", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="4002", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="4003", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="1003", ENV{UPOWER_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="1007", ENV{UPOWER_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="1008", ENV{UPOWER_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="2005", ENV{UPOWER_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="2007", ENV{UPOWER_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="3012", ENV{UPOWER_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="3014", ENV{UPOWER_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="4001", ENV{UPOWER_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="4002", ENV{UPOWER_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="4003", ENV{UPOWER_BATTERY_TYPE}="ups"
# PowerCOM
ATTRS{idVendor}=="0d9f", ATTRS{idProduct}=="00a2", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="0d9f", ATTRS{idProduct}=="00a3", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="0d9f", ATTRS{idProduct}=="00a4", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="0d9f", ATTRS{idProduct}=="00a5", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="0d9f", ATTRS{idProduct}=="00a6", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="0d9f", ATTRS{idProduct}=="00a2", ENV{UPOWER_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="0d9f", ATTRS{idProduct}=="00a3", ENV{UPOWER_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="0d9f", ATTRS{idProduct}=="00a4", ENV{UPOWER_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="0d9f", ATTRS{idProduct}=="00a5", ENV{UPOWER_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="0d9f", ATTRS{idProduct}=="00a6", ENV{UPOWER_BATTERY_TYPE}="ups"
# Liebert
ATTRS{idVendor}=="10af", ATTRS{idProduct}=="0001", ENV{DKP_BATTERY_TYPE}="ups"
ATTRS{idVendor}=="10af", ATTRS{idProduct}=="0001", ENV{UPOWER_BATTERY_TYPE}="ups"
LABEL="dkp_hid_end"
LABEL="up_hid_end"
##############################################################################################################
# Watts Up? Pro Devices
#
SUBSYSTEM=="tty", SUBSYSTEMS=="usb", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6001", ATTRS{serial}=="A80?????", ENV{DKP_VENDOR}="Watts Up, Inc.", ENV{DKP_PRODUCT}="Watts Up? Pro", ENV{DKP_MONITOR_TYPE}="wup"
SUBSYSTEM=="tty", SUBSYSTEMS=="usb", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6001", ATTRS{serial}=="A80?????", ENV{UPOWER_VENDOR}="Watts Up, Inc.", ENV{UPOWER_PRODUCT}="Watts Up? Pro", ENV{UP_MONITOR_TYPE}="wup"
......@@ -140,7 +140,7 @@ up_device_csr_coldplug (UpDevice *device)
/* get the type */
native = G_UDEV_DEVICE (up_device_get_native (device));
type = g_udev_device_get_property (native, "DKP_BATTERY_TYPE");
type = g_udev_device_get_property (native, "UPOWER_BATTERY_TYPE");
if (type == NULL)
goto out;
......@@ -173,16 +173,16 @@ up_device_csr_coldplug (UpDevice *device)
}
/* get optional quirk parameters */
ret = g_udev_device_has_property (native, "DKP_CSR_DUAL");
ret = g_udev_device_has_property (native, "UPOWER_CSR_DUAL");
if (ret)
csr->priv->is_dual = g_udev_device_get_property_as_boolean (native, "DKP_CSR_DUAL");
csr->priv->is_dual = g_udev_device_get_property_as_boolean (native, "UPOWER_CSR_DUAL");
egg_debug ("is_dual=%i", csr->priv->is_dual);
/* prefer DKP names */
vendor = g_udev_device_get_property (native, "DKP_VENDOR");
/* prefer UPOWER names */
vendor = g_udev_device_get_property (native, "UPOWER_VENDOR");
if (vendor == NULL)
vendor = g_udev_device_get_property (native, "ID_VENDOR");
product = g_udev_device_get_property (native, "DKP_PRODUCT");
product = g_udev_device_get_property (native, "UPOWER_PRODUCT");
if (product == NULL)
product = g_udev_device_get_property (native, "ID_PRODUCT");
......
......@@ -314,7 +314,7 @@ up_device_hid_coldplug (UpDevice *device)
/* detect what kind of device we are */
native = G_UDEV_DEVICE (up_device_get_native (device));
type = g_udev_device_get_property (native, "DKP_BATTERY_TYPE");
type = g_udev_device_get_property (native, "UPOWER_BATTERY_TYPE");
if (type == NULL || g_strcmp0 (type, "ups") != 0)
goto out;
......@@ -340,8 +340,8 @@ up_device_hid_coldplug (UpDevice *device)
goto out;
}
/* prefer DKP names */
vendor = g_udev_device_get_property (native, "DKP_VENDOR");
/* prefer UPOWER names */
vendor = g_udev_device_get_property (native, "UPOWER_VENDOR");
if (vendor == NULL)
vendor = g_udev_device_get_property (native, "ID_VENDOR");
......
......@@ -448,10 +448,10 @@ up_device_supply_refresh_battery (UpDeviceSupply *supply)
up_device_supply_make_safe_string (serial_number);
/* are we possibly recalled by the vendor? */
recall_notice = g_udev_device_has_property (native, "DKP_RECALL_NOTICE");
recall_notice = g_udev_device_has_property (native, "UPOWER_RECALL_NOTICE");
if (recall_notice) {
recall_vendor = g_udev_device_get_property (native, "DKP_RECALL_VENDOR");
recall_url = g_udev_device_get_property (native, "DKP_RECALL_URL");
recall_vendor = g_udev_device_get_property (native, "UPOWER_RECALL_VENDOR");
recall_url = g_udev_device_get_property (native, "UPOWER_RECALL_URL");
}
g_object_set (device,
......
......@@ -306,7 +306,7 @@ up_device_wup_coldplug (UpDevice *device)
/* detect what kind of device we are */
native = G_UDEV_DEVICE (up_device_get_native (device));
type = g_udev_device_get_property (native, "DKP_MONITOR_TYPE");
type = g_udev_device_get_property (native, "UP_MONITOR_TYPE");
if (type == NULL || g_strcmp0 (type, "wup") != 0)
goto out;
......@@ -352,11 +352,11 @@ up_device_wup_coldplug (UpDevice *device)
up_device_wup_parse_command (wup, data);
g_free (data);
/* prefer DKP names */
vendor = g_udev_device_get_property (native, "DKP_VENDOR");
/* prefer UPOWER names */
vendor = g_udev_device_get_property (native, "UPOWER_VENDOR");
if (vendor == NULL)
vendor = g_udev_device_get_property (native, "ID_VENDOR");
product = g_udev_device_get_property (native, "DKP_PRODUCT");
product = g_udev_device_get_property (native, "UPOWER_PRODUCT");
if (product == NULL)
product = g_udev_device_get_property (native, "ID_PRODUCT");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment