Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-6]: src/lib/libusbhid Pull up following revision(s) (requested by...



details:   https://anonhg.NetBSD.org/src/rev/ce3db33eaab9
branches:  netbsd-6
changeset: 774103:ce3db33eaab9
user:      riz <riz%NetBSD.org@localhost>
date:      Thu May 17 18:20:26 2012 +0000

description:
Pull up following revision(s) (requested by khorben in ticket #249):
        lib/libusbhid/usb_hid_usages: revision 1.6
Extended usb_hid_usages, with help from the equivalent file from FreeBSD.
Favored NetBSD upon conflicts, except for a typo and consistency.
ok riz@

diffstat:

 lib/libusbhid/usb_hid_usages |  626 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 618 insertions(+), 8 deletions(-)

diffs (truncated from 823 to 300 lines):

diff -r ce3cdb292a47 -r ce3db33eaab9 lib/libusbhid/usb_hid_usages
--- a/lib/libusbhid/usb_hid_usages      Thu May 17 18:18:16 2012 +0000
+++ b/lib/libusbhid/usb_hid_usages      Thu May 17 18:20:26 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: usb_hid_usages,v 1.5 2012/01/17 03:49:20 christos Exp $
+# $NetBSD: usb_hid_usages,v 1.5.2.1 2012/05/17 18:20:26 riz Exp $
 #
 # USB HID usage table
 # Syntax:
@@ -19,6 +19,7 @@
        0x06    Keyboard
        0x07    Keypad
        0x08    Multi-axis Controller
+       0x09    Tablet PC System Controls
        0x30    X
        0x31    Y
        0x32    Z
@@ -32,6 +33,8 @@
        0x3A    Counted Buffer
        0x3B    Byte Count
        0x3C    Motion Wakeup
+       0x3D    Start
+       0x3E    Select
        0x40    Vx
        0x41    Vy
        0x42    Vz
@@ -39,6 +42,8 @@
        0x44    Vbry
        0x45    Vbrx
        0x46    Vno
+       0x47    Feature Notification
+       0x48    Resolution Multiplier
        0x80    System Control
        0x81    System Power Down
        0x82    System Sleep
@@ -53,10 +58,29 @@
        0x8B    System Menu Left
        0x8C    System Menu Up
        0x8D    System Menu Down
+       0x8E    System Cold Restart
+       0x8F    System Warm Restart
        0x90    D-pad Up
        0x91    D-pad Down
        0x92    D-pad Right
        0x93    D-pad Left
+       0xA0    System Dock
+       0xA1    System Undock
+       0xA2    System Setup
+       0xA3    System Break
+       0xA4    System Debugger Break
+       0xA5    Application Break
+       0xA6    Application Debugger Break
+       0xA7    System Speaker Mute
+       0xA8    System Hibernate
+       0xB0    System Display Invert
+       0xB1    System Display Internal
+       0xB2    System Display External
+       0xB3    System Display Both
+       0xB4    System Display Dual
+       0xB5    System Display Toggle Int/Ext
+       0xB6    System Display Swap Primary/Secondary
+       0xB7    System Display LCD Autoscale
 
 2      Simulation Controls
        0x00    Undefined
@@ -542,6 +566,7 @@
        0x2E    Ring Select
        0x2F    Phone Mute
        0x30    Caller ID
+       0x31    Send
        0x50    Speed Dial
        0x51    Store Number
        0x52    Recall Number
@@ -564,6 +589,8 @@
        0x9A    Confirmation Tone 1
        0x9B    Confirmation Tone 2
        0x9C    Tones Off
+       0x9D    Outside Ringback
+       0x9E    Ringer
        0xB0    Phone Key 0
        0xB1    Phone Key 1
        0xB2    Phone Key 2
@@ -586,6 +613,9 @@
        0x01    Consumer Control
        0x02    Numeric Key Pad
        0x03    Programmable Buttons
+       0x04    Microphone
+       0x05    Headphone
+       0x06    Graphic Equalizer
        0x20    +10
        0x21    +100
        0x22    AM/PM
@@ -676,7 +706,9 @@
        0xC9    Show Counter
        0xCA    Tracking Increment
        0xCB    Tracking Decrement
-       0xCD    Pause/Play
+       0xCC    Stop/Eject
+       0xCD    Play/Pause
+       0xCE    Play/Skip
        0xE0    Volume
        0xE1    Balance
        0xE2    Mute
@@ -703,6 +735,11 @@
        0x106   Security Enable
        0x107   Fire Alarm
        0x108   Police Alarm
+       0x109   Proximity
+       0x10A   Motion
+       0x10B   Duress Alarm
+       0x10C   Holdup Alarm
+       0x10D   Medical Alarm
        0x150   Balance Right
        0x151   Balance Left
        0x152   Bass Increment
@@ -763,10 +800,39 @@
        0x1A3   AL Next Task/Application
        0x1A4   AL Previous Task/Application
        0x1A5   AL Preemptive Halt Task/Application
+       0x1A6   AL Integrated Help Center
        0x1A7   AL My Documents
+       0x1A8   AL Thesaurus
+       0x1A9   AL Dictionary
+       0x1AA   AL Desktop
        0x1AB   AC Spell
+       0x1AC   AL Grammar Check
+       0x1AD   AL Wireless Status
+       0x1AE   AL Keyboard Layout
+       0x1AF   AL Virus Protection
+       0x1B0   AL Encryption
+       0x1B1   AL Screen Saver
+       0x1B2   AL Alarms
+       0x1B3   AL Clock
+       0x1B4   AL File Browser
+       0x1B5   AL Power Status
        0x1B6   AL My Pictures
        0x1B7   AL My Music
+       0x1B8   AL Movie Browser
+       0x1B9   AL Digital Rights Manager
+       0x1BA   AL Digital Wallet
+       0x1BC   AL Instant Messaging
+       0x1BD   AL OEM Feature/Tips/Tutorial Browser
+       0x1BE   AL OEM Help
+       0x1BF   AL Online Community
+       0x1C0   AL Entertainment Content Browser
+       0x1C1   AL Online Shopping Browser
+       0x1C2   AL SmartCard Information/Help
+       0x1C3   AL Market Monitor/Finance Browser
+       0x1C4   AL Customized Corporate News Browser
+       0x1C5   AL Online Activity Browser
+       0x1C6   AL Research/Search Browser
+       0x1C7   AL Audio Player
        0x200   Generic GUI Application Controls
        0x201   AC New
        0x202   AC Open
@@ -812,10 +878,102 @@
        0x23A   AC Tile Horizontally
        0x23B   AC Tile Vertically
        0x23C   AC Format
+       0x23D   AC Edit
+       0x23E   AC Bold
+       0x23F   AC Italics
+       0x240   AC Underline
+       0x241   AC Strikethrough
+       0x242   AC Subscript
+       0x243   AC Superscript
+       0x244   AC All Caps
+       0x245   AC Rotate
+       0x246   AC Resize
+       0x247   AC Flip Horizontal
+       0x248   AC Flip Vertical
+       0x249   AC Mirror Horizontal
+       0x24A   AC Mirror Vertical
+       0x24B   AC Font Select
+       0x24C   AC Font Color
+       0x24D   AC Font Size
+       0x24E   AC Justify Left
+       0x24F   AC Justify Center H
+       0x250   AC Justify Right
+       0x251   AC Justify Block H
+       0x252   AC Justify Top
+       0x253   AC Justify Center V
+       0x254   AC Justify Bottom
+       0x255   AC Justify Block V
+       0x256   AC Justify Decrease
+       0x257   AC Justify Increase
+       0x258   AC Numbered List
+       0x259   AC Restart Numbering
+       0x25A   AC Bulleted List
+       0x25B   AC Promote
+       0x25C   AC Demote
+       0x25D   AC Yes
+       0x25E   AC No
+       0x25F   AC Cancel
+       0x260   AC Catalog
+       0x261   AC Buy/Checkout
+       0x262   AC Add to Cart
+       0x263   AC Expand
+       0x264   AC Expand All
+       0x265   AC Collapse
+       0x266   AC Collapse All
+       0x267   AC Print Preview
+       0x268   AC Paste Special
+       0x269   AC Insert Mode
+       0x26A   AC Delete
+       0x26B   AC Lock
+       0x26C   AC Unlock
+       0x26D   AC Protect
+       0x26E   AC Unprotect
+       0x26F   AC Attach Comment
+       0x270   AC Delete Comment
+       0x271   AC View Comment
+       0x272   AC Select Word
+       0x273   AC Select Sentence
+       0x274   AC Select Paragraph
+       0x275   AC Select Column
+       0x276   AC Select Row
+       0x277   AC Select Table
+       0x278   AC Select Object
        0x279   AC Redo
+       0x27A   AC Sort
+       0x27B   AC Sort Ascending
+       0x27C   AC Sort Descending
+       0x27D   AC Filter
+       0x27E   AC Set Clock
+       0x27F   AC View Clock
+       0x280   AC Select Time Zone
+       0x281   AC Edit Time Zones
+       0x282   AC Set Alarm
+       0x283   AC Clear Alarm
+       0x284   AC Snooze Alarm
+       0x285   AC Reset Alarm
+       0x286   AC Synchronize
+       0x287   AC Send/Receive
+       0x288   AC Send To
        0x289   AC Reply
+       0x28A   AC Reply All
        0x28B   AC Fwd
        0x28C   AC Send
+       0x28D   AC Attach File
+       0x28E   AC Upload
+       0x28F   AC Download (Save Target As)
+       0x290   AC Set Borders
+       0x291   AC Insert Row
+       0x292   AC Insert Column
+       0x293   AC Insert File
+       0x294   AC Insert Picture
+       0x295   AC Insert Object
+       0x296   AC Insert Symbol
+       0x297   AC Save and Close
+       0x298   AC Rename
+       0x299   AC Merge
+       0x29A   AC Split
+       0x29B   AC Distribute Horizontally
+       0x29C   AC Distribute Vertically
 
 13     Digitizer
        0x00    Undefined
@@ -832,9 +990,11 @@
        0x0B    Armature
        0x0C    Multiple Point Digitizer
        0x0D    Free Space Wand
+       0x0E    Device Configuration
        0x20    Stylus
        0x21    Puck
        0x22    Finger
+       0x23    Device Settings
        0x30    Tip Pressure
        0x31    Barrel Pressure
        0x32    In Range
@@ -858,12 +1018,122 @@
        0x44    Barrel Switch
        0x45    Eraser
        0x46    Tablet Pick
-       0x51    Contact ID
-       0x53    Device Index
+       0x47    Touch Valid
+       0x48    Width
+       0x49    Height
+       0x51    Contact Identifier
+       0x52    Device Mode
+       0x53    Device Identifier
        0x54    Contact Count
        0x55    Contact Count Maximum
 
 15     Physical Interface Device
+       0x00    Undefined
+       0x01    Physical Interface Device
+       0x20    Normal
+       0x21    Set Effect Report
+       0x22    Effect Block Index
+       0x23    Parameter Block Offset
+       0x24    ROM Flag
+       0x25    Effect Type
+       0x26    ET Constant Force
+       0x27    ET Ramp
+       0x28    ET Custom Force Data
+       0x30    ET Square
+       0x31    ET Sine
+       0x32    ET Triangle



Home | Main Index | Thread Index | Old Index