Skip to content

Commit 0313a6a

Browse files
Steven WhiteSteven White
Steven White
authored and
Steven White
committed
Merged PR 21154: Some corrections
Some corrections
1 parent 9187820 commit 0313a6a

2 files changed

Lines changed: 38 additions & 33 deletions

File tree

‎windows.devices.enumeration/deviceinformationkind.md‎

Lines changed: 37 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -73,37 +73,9 @@ The [Id](deviceinformation_id.md) for this object as a string.
7373

7474
### -field AssociationEndpointProtocol:9
7575

76-
Specifies that the [DeviceInformation](deviceinformation.md) object represents a protocol through which association endpoints (AEPs) can be discovered. You can scope an association endpoint discovery to specific protocols by using the protocol ID. For example, the following selector scopes discovery to Bluetooth LE or Bluetooth Classic.
76+
The [DeviceInformation](deviceinformation.md) object represents a protocol through which association endpoints (AEPs) can be discovered. You can scope an association endpoint discovery to specific protocols by using the protocol ID. For example, the following selector scopes discovery to Bluetooth LE or Bluetooth Classic.
7777

78-
`System.Devices.Aep.ProtocolId:="{e0cbf06c-cd8b-4647-bb8a-263b43f0f974}"` or `DEVPKEY_Aep_ProtocolId:="{e0cbf06c-cd8b-4647-bb8a-263b43f0f974}"`.
79-
80-
System.Devices.Aep.ProtocolId is the protocol's name in propsys; and DEVPKEY_Aep_ProtocolId is the Win32 DEVPKEY.
81-
82-
Here's a representative example of what enumerating a protocol looks like, and how it matches up to the AEP properties (with annotations inside square brackets).
83-
84-
```console
85-
> pairtool /enum-protocols
86-
...
87-
Protocol ID: Bluetooth [DEVPKEY_Aep_ProviderName]
88-
Protocol Provider Name: Bluetooth
89-
Protocol Name: Bluetooth Classic
90-
Universal Protocol ID: {e0cbf06c-cd8b-4647-bb8a-263b43f0f974} [DEVPKEY_Aep_ProtocolId // <propertyDescription name="System.Devices.Aep.ProtocolId" formatID="{3B2CE006-5E61-4FDE-BAB8-9B8AAC9B26DF}" propID="5">]
91-
Protocol Provider Class ID: {4aa383d6-337a-43d3-a3fa-c14b26004130}
92-
93-
Protocol ID: BluetoothLE [DEVPKEY_Aep_ProviderName]
94-
Protocol Provider Name: BluetoothLE
95-
Protocol Name: Bluetooth Low Energy
96-
Universal Protocol ID: {bb7bb05e-5972-42b5-94fc-76eaa7084d49} [DEVPKEY_Aep_ProtocolId]
97-
Protocol Provider Class ID: {0829c308-d361-49f4-828b-506d552029ef}
98-
...
99-
> pairtool /enum-endpoints
100-
101-
BluetoothLE#BluetoothLEdc:46:28:6a:16:01-20:4c:03:45:07:ca
102-
1)DEVPKEY_Aep_ContainerId [SYS] (null) DEVPROP_TYPE_GUID 16 {72888bff-567a-54f9-861a-73a3f2df469c}
103-
...
104-
30)DEVPKEY_Aep_ProviderName [SYS] (null) DEVPROP_TYPE_STRING 24 "BluetoothLE"
105-
33)DEVPKEY_Aep_ProtocolId [SYS] (null) DEVPROP_TYPE_GUID 16 {bb7bb05e-5972-42b5-94fc-76eaa7084d49}
106-
```
78+
See **Remarks** for more info.
10779

10880
## -remarks
10981

@@ -133,10 +105,43 @@ Here's another example; this time of a Bluetooth headset. The devnode is selecte
133105

134106
<img src="images/example_4.png" alt="X" />
135107

136-
Lastly, Here's an example of a devnode that shows what panel it belongs to, together with its Id. The panel represents the USB ports on the top of a personal computer's chassis. This illustrates the relationship between **DevicePanel** (at the top of the illustration) and **Device** (or devnode; at the bottom of the illustration). Devnodes and device interfaces can have a *System.Devices.Panel.PanelId* property value. You can then use that value to find a **DevicePanel** object whose core Id matches the value.
108+
And here's an example of a devnode that shows what panel it belongs to, together with its Id. The panel represents the USB ports on the top of a personal computer's chassis. This illustrates the relationship between **DevicePanel** (at the top of the illustration) and **Device** (or devnode; at the bottom of the illustration). Devnodes and device interfaces can have a *System.Devices.Panel.PanelId* property value. You can then use that value to find a **DevicePanel** object whose core Id matches the value.
137109

138110
<img src="images/example_5.png" alt="X" />
139111

112+
113+
For the **AssociationEndpointProtocol** constant, an example AQS selector string is:
114+
115+
`System.Devices.Aep.ProtocolId:="{e0cbf06c-cd8b-4647-bb8a-263b43f0f974}"` (for Bluetooth Classic) or `System.Devices.Aep.ProtocolId:=:"{bb7bb05e-5972-42b5-94fc-76eaa7084d49}"` (for Bluetooth LE).
116+
117+
System.Devices.Aep.ProtocolId is the protocol's name in propsys; and DEVPKEY_Aep_ProtocolId is the Win32 DEVPKEY.
118+
119+
Here's a representative example of what enumerating a protocol looks like, and how it matches up to the AEP properties (with annotations inside square brackets).
120+
121+
```console
122+
> pairtool /enum-protocols
123+
...
124+
Protocol ID: Bluetooth [DEVPKEY_Aep_ProviderName]
125+
Protocol Provider Name: Bluetooth
126+
Protocol Name: Bluetooth Classic
127+
Universal Protocol ID: {e0cbf06c-cd8b-4647-bb8a-263b43f0f974} [DEVPKEY_Aep_ProtocolId // <propertyDescription name="System.Devices.Aep.ProtocolId" formatID="{3B2CE006-5E61-4FDE-BAB8-9B8AAC9B26DF}" propID="5">]
128+
Protocol Provider Class ID: {4aa383d6-337a-43d3-a3fa-c14b26004130}
129+
130+
Protocol ID: BluetoothLE [DEVPKEY_Aep_ProviderName]
131+
Protocol Provider Name: BluetoothLE
132+
Protocol Name: Bluetooth Low Energy
133+
Universal Protocol ID: {bb7bb05e-5972-42b5-94fc-76eaa7084d49} [DEVPKEY_Aep_ProtocolId]
134+
Protocol Provider Class ID: {0829c308-d361-49f4-828b-506d552029ef}
135+
...
136+
> pairtool /enum-endpoints
137+
138+
BluetoothLE#BluetoothLEdc:46:28:6a:16:01-20:4c:03:45:07:ca
139+
1)DEVPKEY_Aep_ContainerId [SYS] (null) DEVPROP_TYPE_GUID 16 {72888bff-567a-54f9-861a-73a3f2df469c}
140+
...
141+
30)DEVPKEY_Aep_ProviderName [SYS] (null) DEVPROP_TYPE_STRING 24 "BluetoothLE"
142+
33)DEVPKEY_Aep_ProtocolId [SYS] (null) DEVPROP_TYPE_GUID 16 {bb7bb05e-5972-42b5-94fc-76eaa7084d49}
143+
```
144+
140145
### Version history
141146

142147
| Windows version | SDK version | Value added |
@@ -147,4 +152,4 @@ Lastly, Here's an example of a devnode that shows what panel it belongs to, toge
147152

148153
## -see-also
149154

150-
[[DeviceInformation.Kind](deviceinformation_kind.md), [DeviceInformationUpdate.Kind](deviceinformationupdate_kind.md), [CreateFromIdAsync(System.String deviceId, Windows.Foundation.Collections.IIterable<System.String> additionalProperties, Windows.Devices.Enumeration.DeviceInformationKind kind)](deviceinformation_createfromidasync_270724983.md), [CreateWatcher(System.String,Windows.Foundation.Collections.IIterable{System.String},Windows.Devices.Enumeration.DeviceInformationKind)](deviceinformation_createwatcher_990788373.md), [FindAllAsync(System.String,Windows.Foundation.Collections.IIterable{System.String},Windows.Devices.Enumeration.DeviceInformationKind)](deviceinformation_findallasync_1907805458.md), [devicepairingresultstatus.md](devicepairingresultstatus.md)
155+
[DeviceInformation.Kind](deviceinformation_kind.md), [DeviceInformationUpdate.Kind](deviceinformationupdate_kind.md), [CreateFromIdAsync(System.String deviceId, Windows.Foundation.Collections.IIterable<System.String> additionalProperties, Windows.Devices.Enumeration.DeviceInformationKind kind)](deviceinformation_createfromidasync_270724983.md), [CreateWatcher(System.String,Windows.Foundation.Collections.IIterable{System.String},Windows.Devices.Enumeration.DeviceInformationKind)](deviceinformation_createwatcher_990788373.md), [FindAllAsync(System.String,Windows.Foundation.Collections.IIterable{System.String},Windows.Devices.Enumeration.DeviceInformationKind)](deviceinformation_findallasync_1907805458.md), [devicepairingresultstatus.md](devicepairingresultstatus.md)

‎windows.devices.enumeration/devicepairingkinds.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The application must display the given PIN to the user and ask the user to confi
3535
The application must request a user name and password from the user. With a value of **ProvidePasswordCredential**, call [AcceptWithPasswordCredential](devicepairingrequestedeventargs_acceptwithpasswordcredential_1073078053.md) from the event args of the [PairingRequested](deviceinformationcustompairing_pairingrequested.md) event handler to accept the pairing. Pass in the [PasswordCredential](../windows.security.credentials/passwordcredential.md) that encapsulates the user name and password as a parameter.
3636

3737
### -field ProvideAddress:32
38-
Specifies that your application must provide an address from the device. This is typically used for directed discovery over a network protocol such as IPP or UPnP, where the application already knows the IP/address/URL of the device. With a value of **ProvideAddress**, you should call [DevicePairingRequestedEventArgs.AcceptWithAddress](./devicepairingrequestedeventargs_acceptwithaddress_1238468511.md) on the event args of the [DeviceInformationCustomPairing.PairingRequested](/uwp/api/windows.devices.enumeration.deviceinformationcustompairing.pairingrequested) event handler, if you want the pairing to complete. Pass in the address as a parameter.
38+
The application must provide an address from the device. This is typically used for directed discovery over a network protocol such as IPP or UPnP, where the application already knows the IP/address/URL of the device. With a value of **ProvideAddress**, you should call [AcceptWithAddress](./devicepairingrequestedeventargs_acceptwithaddress_1238468511.md) on the event args of the [PairingRequested](/uwp/api/windows.devices.enumeration.deviceinformationcustompairing.pairingrequested) event handler, if you want the pairing to complete. Pass in the address as a parameter.
3939

4040
## -remarks
4141
This value is a collection of flags. It's possible to have multiple values set for a single pairing action.

0 commit comments

Comments
 (0)