replace class/subclass with Class type
This commit is contained in:
@@ -56,8 +56,8 @@ func (i InterfaceInfo) String() string {
|
|||||||
type InterfaceSetup struct {
|
type InterfaceSetup struct {
|
||||||
Number uint8
|
Number uint8
|
||||||
Alternate uint8
|
Alternate uint8
|
||||||
IfClass uint8
|
IfClass Class
|
||||||
IfSubClass uint8
|
IfSubClass Class
|
||||||
IfProtocol uint8
|
IfProtocol uint8
|
||||||
Endpoints []EndpointInfo
|
Endpoints []EndpointInfo
|
||||||
}
|
}
|
||||||
|
@@ -17,6 +17,7 @@ package usb
|
|||||||
|
|
||||||
// #include <libusb.h>
|
// #include <libusb.h>
|
||||||
import "C"
|
import "C"
|
||||||
|
import "strconv"
|
||||||
|
|
||||||
type Class uint8
|
type Class uint8
|
||||||
|
|
||||||
@@ -51,7 +52,10 @@ var classDescription = map[Class]string{
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (c Class) String() string {
|
func (c Class) String() string {
|
||||||
return classDescription[c]
|
if d, ok := classDescription[c]; ok {
|
||||||
|
return d
|
||||||
|
}
|
||||||
|
return strconv.Itoa(int(c))
|
||||||
}
|
}
|
||||||
|
|
||||||
type DescriptorType uint8
|
type DescriptorType uint8
|
||||||
|
@@ -27,7 +27,7 @@ var testBulkInEP = EndpointInfo{
|
|||||||
var testBulkInSetup = InterfaceSetup{
|
var testBulkInSetup = InterfaceSetup{
|
||||||
Number: 0,
|
Number: 0,
|
||||||
Alternate: 0,
|
Alternate: 0,
|
||||||
IfClass: uint8(ClassVendorSpec),
|
IfClass: ClassVendorSpec,
|
||||||
Endpoints: []EndpointInfo{testBulkInEP},
|
Endpoints: []EndpointInfo{testBulkInEP},
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -43,6 +43,6 @@ var testIsoOutEP = EndpointInfo{
|
|||||||
var testIsoOutSetup = InterfaceSetup{
|
var testIsoOutSetup = InterfaceSetup{
|
||||||
Number: 0,
|
Number: 0,
|
||||||
Alternate: 0,
|
Alternate: 0,
|
||||||
IfClass: uint8(ClassVendorSpec),
|
IfClass: ClassVendorSpec,
|
||||||
Endpoints: []EndpointInfo{testIsoOutEP},
|
Endpoints: []EndpointInfo{testIsoOutEP},
|
||||||
}
|
}
|
||||||
|
@@ -43,7 +43,7 @@ var (
|
|||||||
Setups: []InterfaceSetup{{
|
Setups: []InterfaceSetup{{
|
||||||
Number: 0,
|
Number: 0,
|
||||||
Alternate: 0,
|
Alternate: 0,
|
||||||
IfClass: uint8(ClassVendorSpec),
|
IfClass: ClassVendorSpec,
|
||||||
Endpoints: []EndpointInfo{{
|
Endpoints: []EndpointInfo{{
|
||||||
Number: 1,
|
Number: 1,
|
||||||
Direction: EndpointDirectionOut,
|
Direction: EndpointDirectionOut,
|
||||||
@@ -79,14 +79,14 @@ var (
|
|||||||
Setups: []InterfaceSetup{{
|
Setups: []InterfaceSetup{{
|
||||||
Number: 0,
|
Number: 0,
|
||||||
Alternate: 0,
|
Alternate: 0,
|
||||||
IfClass: uint8(ClassVendorSpec),
|
IfClass: ClassVendorSpec,
|
||||||
}},
|
}},
|
||||||
}, {
|
}, {
|
||||||
Number: 1,
|
Number: 1,
|
||||||
Setups: []InterfaceSetup{{
|
Setups: []InterfaceSetup{{
|
||||||
Number: 1,
|
Number: 1,
|
||||||
Alternate: 0,
|
Alternate: 0,
|
||||||
IfClass: uint8(ClassVendorSpec),
|
IfClass: ClassVendorSpec,
|
||||||
Endpoints: []EndpointInfo{{
|
Endpoints: []EndpointInfo{{
|
||||||
Number: 5,
|
Number: 5,
|
||||||
Direction: EndpointDirectionOut,
|
Direction: EndpointDirectionOut,
|
||||||
@@ -103,7 +103,7 @@ var (
|
|||||||
}, {
|
}, {
|
||||||
Number: 1,
|
Number: 1,
|
||||||
Alternate: 1,
|
Alternate: 1,
|
||||||
IfClass: uint8(ClassVendorSpec),
|
IfClass: ClassVendorSpec,
|
||||||
Endpoints: []EndpointInfo{{
|
Endpoints: []EndpointInfo{{
|
||||||
Number: 5,
|
Number: 5,
|
||||||
Direction: EndpointDirectionOut,
|
Direction: EndpointDirectionOut,
|
||||||
@@ -118,7 +118,7 @@ var (
|
|||||||
}, {
|
}, {
|
||||||
Number: 1,
|
Number: 1,
|
||||||
Alternate: 2,
|
Alternate: 2,
|
||||||
IfClass: uint8(ClassVendorSpec),
|
IfClass: ClassVendorSpec,
|
||||||
Endpoints: []EndpointInfo{{
|
Endpoints: []EndpointInfo{{
|
||||||
Number: 5,
|
Number: 5,
|
||||||
Direction: EndpointDirectionIn,
|
Direction: EndpointDirectionIn,
|
||||||
|
@@ -241,8 +241,8 @@ func (libusbImpl) getDeviceDesc(d *libusbDevice) (*Descriptor, error) {
|
|||||||
i := InterfaceSetup{
|
i := InterfaceSetup{
|
||||||
Number: uint8(alt.bInterfaceNumber),
|
Number: uint8(alt.bInterfaceNumber),
|
||||||
Alternate: uint8(alt.bAlternateSetting),
|
Alternate: uint8(alt.bAlternateSetting),
|
||||||
IfClass: uint8(alt.bInterfaceClass),
|
IfClass: Class(alt.bInterfaceClass),
|
||||||
IfSubClass: uint8(alt.bInterfaceSubClass),
|
IfSubClass: Class(alt.bInterfaceSubClass),
|
||||||
IfProtocol: uint8(alt.bInterfaceProtocol),
|
IfProtocol: uint8(alt.bInterfaceProtocol),
|
||||||
}
|
}
|
||||||
var ends []C.struct_libusb_endpoint_descriptor
|
var ends []C.struct_libusb_endpoint_descriptor
|
||||||
|
Reference in New Issue
Block a user