Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
U
upower
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
75
Issues
75
List
Boards
Labels
Service Desk
Milestones
Merge Requests
13
Merge Requests
13
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
upower
upower
Commits
bc928f7a
Commit
bc928f7a
authored
Jan 18, 2010
by
Richard Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
trivial: switch to using the new udev attribute names (no ABI or API break)
parent
c8cec18f
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
203 additions
and
203 deletions
+203
-203
rules/95-devkit-power-battery-recall-dell.rules
rules/95-devkit-power-battery-recall-dell.rules
+46
-46
rules/95-devkit-power-battery-recall-fujitsu.rules
rules/95-devkit-power-battery-recall-fujitsu.rules
+16
-16
rules/95-devkit-power-battery-recall-gateway.rules
rules/95-devkit-power-battery-recall-gateway.rules
+13
-13
rules/95-devkit-power-battery-recall-ibm.rules
rules/95-devkit-power-battery-recall-ibm.rules
+24
-24
rules/95-devkit-power-battery-recall-lenovo.rules
rules/95-devkit-power-battery-recall-lenovo.rules
+9
-9
rules/95-devkit-power-battery-recall-toshiba.rules
rules/95-devkit-power-battery-recall-toshiba.rules
+14
-14
rules/95-devkit-power-csr.rules
rules/95-devkit-power-csr.rules
+14
-14
rules/95-devkit-power-hid.rules
rules/95-devkit-power-hid.rules
+50
-50
rules/95-devkit-power-wup.rules
rules/95-devkit-power-wup.rules
+1
-1
src/linux/up-device-csr.c
src/linux/up-device-csr.c
+6
-6
src/linux/up-device-hid.c
src/linux/up-device-hid.c
+3
-3
src/linux/up-device-supply.c
src/linux/up-device-supply.c
+3
-3
src/linux/up-device-wup.c
src/linux/up-device-wup.c
+4
-4
No files found.
rules/95-devkit-power-battery-recall-dell.rules
View file @
bc928f7a
...
...
@@ -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="
dk
p_battery_recall_dell_end"
SUBSYSTEM!="power_supply", GOTO="
u
p_battery_recall_dell_end"
# only match batteries
ATTR{type}!="Battery", GOTO="
dk
p_battery_recall_dell_end"
ATTR{type}!="Battery", GOTO="
u
p_battery_recall_dell_end"
# only match correct manufacturer
ATTR{manufacturer}!="Dell", GOTO="
dk
p_battery_recall_dell_end"
ATTR{manufacturer}!="Dell", GOTO="
u
p_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="
dk
p_battery_recall_dell_end"
LABEL="
u
p_battery_recall_dell_end"
rules/95-devkit-power-battery-recall-fujitsu.rules
View file @
bc928f7a
...
...
@@ -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="
dk
p_battery_recall_fujitsu_end"
SUBSYSTEM!="power_supply", GOTO="
u
p_battery_recall_fujitsu_end"
# only match batteries
ATTR{type}!="Battery", GOTO="
dk
p_battery_recall_fujitsu_end"
ATTR{type}!="Battery", GOTO="
u
p_battery_recall_fujitsu_end"
# only match correct manufacturer
ATTR{manufacturer}!="Fujitsu", GOTO="
dk
p_battery_recall_fujitsu_end"
ATTR{manufacturer}!="Fujitsu", GOTO="
u
p_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="
dk
p_battery_recall_fujitsu_end"
LABEL="
u
p_battery_recall_fujitsu_end"
rules/95-devkit-power-battery-recall-gateway.rules
View file @
bc928f7a
...
...
@@ -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="
dk
p_battery_recall_gateway_end"
SUBSYSTEM!="power_supply", GOTO="
u
p_battery_recall_gateway_end"
# only match batteries
ATTR{type}!="Battery", GOTO="
dk
p_battery_recall_gateway_end"
ATTR{type}!="Battery", GOTO="
u
p_battery_recall_gateway_end"
# only match correct manufacturer
ATTR{manufacturer}!="Gateway", GOTO="
dk
p_battery_recall_gateway_end"
ATTR{manufacturer}!="Gateway", GOTO="
u
p_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="
dk
p_battery_recall_gateway_end"
LABEL="
u
p_battery_recall_gateway_end"
rules/95-devkit-power-battery-recall-ibm.rules
View file @
bc928f7a
...
...
@@ -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="
dk
p_battery_recall_ibm_end"
SUBSYSTEM!="power_supply", GOTO="
u
p_battery_recall_ibm_end"
# only match batteries
ATTR{type}!="Battery", GOTO="
dk
p_battery_recall_ibm_end"
ATTR{type}!="Battery", GOTO="
u
p_battery_recall_ibm_end"
# only match correct manufacturer
ATTR{manufacturer}!="SONY", GOTO="
dk
p_battery_recall_ibm_end"
ATTR{manufacturer}!="SONY", GOTO="
u
p_battery_recall_ibm_end"
# only recalled on some particular models
ATTR{[dmi/id]product_version}!="*R60*|*T60*|*Z60m*|*Z61e*|*Z61m*|*Z61p*", GOTO="
dk
p_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="
dk
p_battery_recall_ibm_end"
ATTR{[dmi/id]product_version}!="*R60*|*T60*|*Z60m*|*Z61e*|*Z61m*|*Z61p*", GOTO="
u
p_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="
u
p_battery_recall_ibm_end"
rules/95-devkit-power-battery-recall-lenovo.rules
View file @
bc928f7a
...
...
@@ -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="
dk
p_battery_recall_lenovo_end"
SUBSYSTEM!="power_supply", GOTO="
u
p_battery_recall_lenovo_end"
# only match batteries
ATTR{type}!="Battery", GOTO="
dk
p_battery_recall_lenovo_end"
ATTR{type}!="Battery", GOTO="
u
p_battery_recall_lenovo_end"
# only match correct manufacturer
ATTR{manufacturer}!="SANYO", GOTO="
dk
p_battery_recall_lenovo_end"
ATTR{manufacturer}!="SANYO", GOTO="
u
p_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="
dk
p_battery_recall_lenovo_end"
LABEL="
u
p_battery_recall_lenovo_end"
rules/95-devkit-power-battery-recall-toshiba.rules
View file @
bc928f7a
...
...
@@ -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="
dk
p_battery_recall_toshiba_end"
SUBSYSTEM!="power_supply", GOTO="
u
p_battery_recall_toshiba_end"
# only match batteries
ATTR{type}!="Battery", GOTO="
dk
p_battery_recall_toshiba_end"
ATTR{type}!="Battery", GOTO="
u
p_battery_recall_toshiba_end"
# only match correct manufacturer
ATTR{manufacturer}!="TOSHIBA", GOTO="
dk
p_battery_recall_toshiba_end"
ATTR{manufacturer}!="TOSHIBA", GOTO="
u
p_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="
dk
p_battery_recall_toshiba_end"
LABEL="
u
p_battery_recall_toshiba_end"
rules/95-devkit-power-csr.rules
View file @
bc928f7a
...
...
@@ -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="
dk
p_csr_end"
SUBSYSTEM!="usb", GOTO="
u
p_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="
dk
p_csr_end"
LABEL="
u
p_csr_end"
rules/95-devkit-power-hid.rules
View file @
bc928f7a
...
...
@@ -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="
dk
p_hid_end"
SUBSYSTEM!="usb", GOTO="
u
p_hid_end"
# if usbraw device, ignore
KERNEL!="hiddev*", GOTO="
dk
p_hid_end"
KERNEL!="hiddev*", GOTO="
u
p_hid_end"
# if an interface, ignore
ENV{DEVTYPE}=="usb_interface", GOTO="
dk
p_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="
u
p_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="
dk
p_hid_end"
LABEL="
u
p_hid_end"
rules/95-devkit-power-wup.rules
View file @
bc928f7a
##############################################################################################################
# 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{DK
P_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{U
P_MONITOR_TYPE}="wup"
src/linux/up-device-csr.c
View file @
bc928f7a
...
...
@@ -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"
);
...
...
src/linux/up-device-hid.c
View file @
bc928f7a
...
...
@@ -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"
);
...
...
src/linux/up-device-supply.c
View file @
bc928f7a
...
...
@@ -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
,
...
...
src/linux/up-device-wup.c
View file @
bc928f7a
...
...
@@ -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
,
"
DK
P_MONITOR_TYPE"
);
type
=
g_udev_device_get_property
(
native
,
"
U
P_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"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment