diff options
Diffstat (limited to 'Documentation/usb')
-rw-r--r-- | Documentation/usb/authorization.txt | 10 | ||||
-rw-r--r-- | Documentation/usb/usbmon.txt | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/Documentation/usb/authorization.txt b/Documentation/usb/authorization.txt index 381b22ee7834..c069b6884c77 100644 --- a/Documentation/usb/authorization.txt +++ b/Documentation/usb/authorization.txt | |||
@@ -16,20 +16,20 @@ Usage: | |||
16 | 16 | ||
17 | Authorize a device to connect: | 17 | Authorize a device to connect: |
18 | 18 | ||
19 | $ echo 1 > /sys/usb/devices/DEVICE/authorized | 19 | $ echo 1 > /sys/bus/usb/devices/DEVICE/authorized |
20 | 20 | ||
21 | Deauthorize a device: | 21 | Deauthorize a device: |
22 | 22 | ||
23 | $ echo 0 > /sys/usb/devices/DEVICE/authorized | 23 | $ echo 0 > /sys/bus/usb/devices/DEVICE/authorized |
24 | 24 | ||
25 | Set new devices connected to hostX to be deauthorized by default (ie: | 25 | Set new devices connected to hostX to be deauthorized by default (ie: |
26 | lock down): | 26 | lock down): |
27 | 27 | ||
28 | $ echo 0 > /sys/bus/devices/usbX/authorized_default | 28 | $ echo 0 > /sys/bus/usb/devices/usbX/authorized_default |
29 | 29 | ||
30 | Remove the lock down: | 30 | Remove the lock down: |
31 | 31 | ||
32 | $ echo 1 > /sys/bus/devices/usbX/authorized_default | 32 | $ echo 1 > /sys/bus/usb/devices/usbX/authorized_default |
33 | 33 | ||
34 | By default, Wired USB devices are authorized by default to | 34 | By default, Wired USB devices are authorized by default to |
35 | connect. Wireless USB hosts deauthorize by default all new connected | 35 | connect. Wireless USB hosts deauthorize by default all new connected |
@@ -47,7 +47,7 @@ USB port): | |||
47 | boot up | 47 | boot up |
48 | rc.local -> | 48 | rc.local -> |
49 | 49 | ||
50 | for host in /sys/bus/devices/usb* | 50 | for host in /sys/bus/usb/devices/usb* |
51 | do | 51 | do |
52 | echo 0 > $host/authorized_default | 52 | echo 0 > $host/authorized_default |
53 | done | 53 | done |
diff --git a/Documentation/usb/usbmon.txt b/Documentation/usb/usbmon.txt index 6c3c625b7f30..66f92d1194c1 100644 --- a/Documentation/usb/usbmon.txt +++ b/Documentation/usb/usbmon.txt | |||
@@ -33,7 +33,7 @@ if usbmon is built into the kernel. | |||
33 | 33 | ||
34 | Verify that bus sockets are present. | 34 | Verify that bus sockets are present. |
35 | 35 | ||
36 | # ls /sys/kernel/debug/usbmon | 36 | # ls /sys/kernel/debug/usb/usbmon |
37 | 0s 0u 1s 1t 1u 2s 2t 2u 3s 3t 3u 4s 4t 4u | 37 | 0s 0u 1s 1t 1u 2s 2t 2u 3s 3t 3u 4s 4t 4u |
38 | # | 38 | # |
39 | 39 | ||
@@ -58,11 +58,11 @@ Bus=03 means it's bus 3. | |||
58 | 58 | ||
59 | 3. Start 'cat' | 59 | 3. Start 'cat' |
60 | 60 | ||
61 | # cat /sys/kernel/debug/usbmon/3u > /tmp/1.mon.out | 61 | # cat /sys/kernel/debug/usb/usbmon/3u > /tmp/1.mon.out |
62 | 62 | ||
63 | to listen on a single bus, otherwise, to listen on all buses, type: | 63 | to listen on a single bus, otherwise, to listen on all buses, type: |
64 | 64 | ||
65 | # cat /sys/kernel/debug/usbmon/0u > /tmp/1.mon.out | 65 | # cat /sys/kernel/debug/usb/usbmon/0u > /tmp/1.mon.out |
66 | 66 | ||
67 | This process will be reading until killed. Naturally, the output can be | 67 | This process will be reading until killed. Naturally, the output can be |
68 | redirected to a desirable location. This is preferred, because it is going | 68 | redirected to a desirable location. This is preferred, because it is going |
@@ -305,7 +305,7 @@ Before the call, hdr, data, and alloc should be filled. Upon return, the area | |||
305 | pointed by hdr contains the next event structure, and the data buffer contains | 305 | pointed by hdr contains the next event structure, and the data buffer contains |
306 | the data, if any. The event is removed from the kernel buffer. | 306 | the data, if any. The event is removed from the kernel buffer. |
307 | 307 | ||
308 | The MON_IOCX_GET copies 48 bytes, MON_IOCX_GETX copies 64 bytes. | 308 | The MON_IOCX_GET copies 48 bytes to hdr area, MON_IOCX_GETX copies 64 bytes. |
309 | 309 | ||
310 | MON_IOCX_MFETCH, defined as _IOWR(MON_IOC_MAGIC, 7, struct mon_mfetch_arg) | 310 | MON_IOCX_MFETCH, defined as _IOWR(MON_IOC_MAGIC, 7, struct mon_mfetch_arg) |
311 | 311 | ||