From b70848cf736cd13244657e76559a212141ed6071 Mon Sep 17 00:00:00 2001 From: Sebastian Zagrodzki Date: Mon, 27 Mar 2017 22:23:47 +0200 Subject: [PATCH] start renaming the constants to Go-style. --- rawread/main.go | 2 +- usb/config.go | 4 +- usb/constants.go | 96 +++++++++++++++++++-------------------- usb/endpoint.go | 4 +- usb/endpoint_info_test.go | 4 +- usb/fakelibusb_test.go | 26 +++++------ usb/transfer_test.go | 4 +- 7 files changed, 70 insertions(+), 70 deletions(-) diff --git a/rawread/main.go b/rawread/main.go index c389c4f..f82da95 100644 --- a/rawread/main.go +++ b/rawread/main.go @@ -163,7 +163,7 @@ func main() { } log.Printf("Connecting to endpoint %d...", *endpoint) - ep, err := dev.OpenEndpoint(uint8(*config), uint8(*iface), uint8(*setup), uint8(*endpoint)|uint8(usb.ENDPOINT_DIR_IN)) + ep, err := dev.OpenEndpoint(uint8(*config), uint8(*iface), uint8(*setup), uint8(*endpoint)|uint8(usb.EndpointDirectionIn)) if err != nil { log.Fatalf("open: %s", err) } diff --git a/usb/config.go b/usb/config.go index f967595..71b547c 100644 --- a/usb/config.go +++ b/usb/config.go @@ -30,7 +30,7 @@ type EndpointInfo struct { } func (e EndpointInfo) Number() int { - return int(e.Address) & ENDPOINT_NUM_MASK + return int(e.Address) & EndpointNumMask } func (e EndpointInfo) TransferType() TransferType { @@ -38,7 +38,7 @@ func (e EndpointInfo) TransferType() TransferType { } func (e EndpointInfo) Direction() EndpointDirection { - return EndpointDirection(e.Address) & ENDPOINT_DIR_MASK + return EndpointDirection(e.Address) & EndpointDirectionMask } func (e EndpointInfo) String() string { diff --git a/usb/constants.go b/usb/constants.go index 67c41ce..b5cc21e 100644 --- a/usb/constants.go +++ b/usb/constants.go @@ -21,33 +21,33 @@ import "C" type Class uint8 const ( - CLASS_PER_INTERFACE Class = C.LIBUSB_CLASS_PER_INTERFACE - CLASS_AUDIO Class = C.LIBUSB_CLASS_AUDIO - CLASS_COMM Class = C.LIBUSB_CLASS_COMM - CLASS_HID Class = C.LIBUSB_CLASS_HID - CLASS_PRINTER Class = C.LIBUSB_CLASS_PRINTER - CLASS_PTP Class = C.LIBUSB_CLASS_PTP - CLASS_MASS_STORAGE Class = C.LIBUSB_CLASS_MASS_STORAGE - CLASS_HUB Class = C.LIBUSB_CLASS_HUB - CLASS_DATA Class = C.LIBUSB_CLASS_DATA - CLASS_WIRELESS Class = C.LIBUSB_CLASS_WIRELESS - CLASS_APPLICATION Class = C.LIBUSB_CLASS_APPLICATION - CLASS_VENDOR_SPEC Class = C.LIBUSB_CLASS_VENDOR_SPEC + ClassPerInterface Class = C.LIBUSB_CLASS_PER_INTERFACE + ClassAudio Class = C.LIBUSB_CLASS_AUDIO + ClassComm Class = C.LIBUSB_CLASS_COMM + ClassHID Class = C.LIBUSB_CLASS_HID + ClassPrinter Class = C.LIBUSB_CLASS_PRINTER + ClassPTP Class = C.LIBUSB_CLASS_PTP + ClassMassStorage Class = C.LIBUSB_CLASS_MASS_STORAGE + ClassHub Class = C.LIBUSB_CLASS_HUB + ClassData Class = C.LIBUSB_CLASS_DATA + ClassWireless Class = C.LIBUSB_CLASS_WIRELESS + ClassApplication Class = C.LIBUSB_CLASS_APPLICATION + ClassVendorSpec Class = C.LIBUSB_CLASS_VENDOR_SPEC ) var classDescription = map[Class]string{ - CLASS_PER_INTERFACE: "per-interface", - CLASS_AUDIO: "audio", - CLASS_COMM: "communications", - CLASS_HID: "human interface device", - CLASS_PRINTER: "printer dclass", - CLASS_PTP: "picture transfer protocol", - CLASS_MASS_STORAGE: "mass storage", - CLASS_HUB: "hub", - CLASS_DATA: "data", - CLASS_WIRELESS: "wireless", - CLASS_APPLICATION: "application", - CLASS_VENDOR_SPEC: "vendor-specific", + ClassPerInterface: "per-interface", + ClassAudio: "audio", + ClassComm: "communications", + ClassHID: "human interface device", + ClassPrinter: "printer dclass", + ClassPTP: "picture transfer protocol", + ClassMassStorage: "mass storage", + ClassHub: "hub", + ClassData: "data", + ClassWireless: "wireless", + ClassApplication: "application", + ClassVendorSpec: "vendor-specific", } func (c Class) String() string { @@ -57,27 +57,27 @@ func (c Class) String() string { type DescriptorType uint8 const ( - DT_DEVICE DescriptorType = C.LIBUSB_DT_DEVICE - DT_CONFIG DescriptorType = C.LIBUSB_DT_CONFIG - DT_STRING DescriptorType = C.LIBUSB_DT_STRING - DT_INTERFACE DescriptorType = C.LIBUSB_DT_INTERFACE - DT_ENDPOINT DescriptorType = C.LIBUSB_DT_ENDPOINT - DT_HID DescriptorType = C.LIBUSB_DT_HID - DT_REPORT DescriptorType = C.LIBUSB_DT_REPORT - DT_PHYSICAL DescriptorType = C.LIBUSB_DT_PHYSICAL - DT_HUB DescriptorType = C.LIBUSB_DT_HUB + DescriptorTypeDevice DescriptorType = C.LIBUSB_DT_DEVICE + DescriptorTypeConfig DescriptorType = C.LIBUSB_DT_CONFIG + DescriptorTypeString DescriptorType = C.LIBUSB_DT_STRING + DescriptorTypeInterface DescriptorType = C.LIBUSB_DT_INTERFACE + DescriptorTypeEndpoint DescriptorType = C.LIBUSB_DT_ENDPOINT + DescriptorTypeHID DescriptorType = C.LIBUSB_DT_HID + DescriptorTypeReport DescriptorType = C.LIBUSB_DT_REPORT + DescriptorTypePhysical DescriptorType = C.LIBUSB_DT_PHYSICAL + DescriptorTypeHub DescriptorType = C.LIBUSB_DT_HUB ) var descriptorTypeDescription = map[DescriptorType]string{ - DT_DEVICE: "device", - DT_CONFIG: "configuration", - DT_STRING: "string", - DT_INTERFACE: "interface", - DT_ENDPOINT: "endpoint", - DT_HID: "HID", - DT_REPORT: "HID report", - DT_PHYSICAL: "physical", - DT_HUB: "hub", + DescriptorTypeDevice: "device", + DescriptorTypeConfig: "configuration", + DescriptorTypeString: "string", + DescriptorTypeInterface: "interface", + DescriptorTypeEndpoint: "endpoint", + DescriptorTypeHID: "HID", + DescriptorTypeReport: "HID report", + DescriptorTypePhysical: "physical", + DescriptorTypeHub: "hub", } func (dt DescriptorType) String() string { @@ -87,15 +87,15 @@ func (dt DescriptorType) String() string { type EndpointDirection uint8 const ( - ENDPOINT_NUM_MASK = 0x0f - ENDPOINT_DIR_IN EndpointDirection = C.LIBUSB_ENDPOINT_IN - ENDPOINT_DIR_OUT EndpointDirection = C.LIBUSB_ENDPOINT_OUT - ENDPOINT_DIR_MASK EndpointDirection = 0x80 + EndpointNumMask = 0x0f + EndpointDirectionMask = 0x80 + EndpointDirectionIn EndpointDirection = C.LIBUSB_ENDPOINT_IN + EndpointDirectionOut EndpointDirection = C.LIBUSB_ENDPOINT_OUT ) var endpointDirectionDescription = map[EndpointDirection]string{ - ENDPOINT_DIR_IN: "IN", - ENDPOINT_DIR_OUT: "OUT", + EndpointDirectionIn: "IN", + EndpointDirectionOut: "OUT", } func (ed EndpointDirection) String() string { diff --git a/usb/endpoint.go b/usb/endpoint.go index c0c7ccc..1a75804 100644 --- a/usb/endpoint.go +++ b/usb/endpoint.go @@ -31,7 +31,7 @@ type Endpoint struct { } func (e *Endpoint) Read(buf []byte) (int, error) { - if EndpointDirection(e.Address)&ENDPOINT_DIR_MASK != ENDPOINT_DIR_IN { + if EndpointDirection(e.Address)&EndpointDirectionMask != EndpointDirectionIn { return 0, fmt.Errorf("usb: read: not an IN endpoint") } @@ -39,7 +39,7 @@ func (e *Endpoint) Read(buf []byte) (int, error) { } func (e *Endpoint) Write(buf []byte) (int, error) { - if EndpointDirection(e.Address)&ENDPOINT_DIR_MASK != ENDPOINT_DIR_OUT { + if EndpointDirection(e.Address)&EndpointDirectionMask != EndpointDirectionOut { return 0, fmt.Errorf("usb: write: not an OUT endpoint") } diff --git a/usb/endpoint_info_test.go b/usb/endpoint_info_test.go index d19a323..fc52b79 100644 --- a/usb/endpoint_info_test.go +++ b/usb/endpoint_info_test.go @@ -25,7 +25,7 @@ var testBulkInEP = EndpointInfo{ var testBulkInSetup = InterfaceSetup{ Number: 0, Alternate: 0, - IfClass: uint8(CLASS_VENDOR_SPEC), + IfClass: uint8(ClassVendorSpec), Endpoints: []EndpointInfo{testBulkInEP}, } @@ -41,6 +41,6 @@ var testIsoOutEP = EndpointInfo{ var testIsoOutSetup = InterfaceSetup{ Number: 0, Alternate: 0, - IfClass: uint8(CLASS_VENDOR_SPEC), + IfClass: uint8(ClassVendorSpec), Endpoints: []EndpointInfo{testIsoOutEP}, } diff --git a/usb/fakelibusb_test.go b/usb/fakelibusb_test.go index c658d2e..2f52aa8 100644 --- a/usb/fakelibusb_test.go +++ b/usb/fakelibusb_test.go @@ -44,13 +44,13 @@ var ( Setups: []InterfaceSetup{{ Number: 0, Alternate: 0, - IfClass: uint8(CLASS_VENDOR_SPEC), + IfClass: uint8(ClassVendorSpec), Endpoints: []EndpointInfo{{ - Address: uint8(0x01 | ENDPOINT_DIR_OUT), + Address: uint8(0x01 | EndpointDirectionOut), Attributes: uint8(TRANSFER_TYPE_BULK), MaxPacketSize: 512, }, { - Address: uint8(0x02 | ENDPOINT_DIR_IN), + Address: uint8(0x02 | EndpointDirectionIn), Attributes: uint8(TRANSFER_TYPE_BULK), MaxPacketSize: 512, }}, @@ -78,21 +78,21 @@ var ( Setups: []InterfaceSetup{{ Number: 0, Alternate: 0, - IfClass: uint8(CLASS_VENDOR_SPEC), + IfClass: uint8(ClassVendorSpec), }}, }, { Number: 1, Setups: []InterfaceSetup{{ Number: 1, Alternate: 0, - IfClass: uint8(CLASS_VENDOR_SPEC), + IfClass: uint8(ClassVendorSpec), Endpoints: []EndpointInfo{{ - Address: uint8(0x05 | ENDPOINT_DIR_OUT), + Address: uint8(0x05 | EndpointDirectionOut), Attributes: uint8(TRANSFER_TYPE_ISOCHRONOUS), MaxPacketSize: 2<<11 | 1024, MaxIsoPacket: 3 * 1024, }, { - Address: uint8(0x06 | ENDPOINT_DIR_IN), + Address: uint8(0x06 | EndpointDirectionIn), Attributes: uint8(TRANSFER_TYPE_ISOCHRONOUS), MaxPacketSize: 2<<11 | 1024, MaxIsoPacket: 3 * 1024, @@ -100,14 +100,14 @@ var ( }, { Number: 1, Alternate: 1, - IfClass: uint8(CLASS_VENDOR_SPEC), + IfClass: uint8(ClassVendorSpec), Endpoints: []EndpointInfo{{ - Address: uint8(0x05 | ENDPOINT_DIR_OUT), + Address: uint8(0x05 | EndpointDirectionOut), Attributes: uint8(TRANSFER_TYPE_ISOCHRONOUS), MaxPacketSize: 1<<11 | 1024, MaxIsoPacket: 2 * 1024, }, { - Address: uint8(0x06 | ENDPOINT_DIR_IN), + Address: uint8(0x06 | EndpointDirectionIn), Attributes: uint8(TRANSFER_TYPE_ISOCHRONOUS), MaxPacketSize: 1<<11 | 1024, MaxIsoPacket: 2 * 1024, @@ -115,14 +115,14 @@ var ( }, { Number: 1, Alternate: 2, - IfClass: uint8(CLASS_VENDOR_SPEC), + IfClass: uint8(ClassVendorSpec), Endpoints: []EndpointInfo{{ - Address: uint8(0x05 | ENDPOINT_DIR_OUT), + Address: uint8(0x05 | EndpointDirectionOut), Attributes: uint8(TRANSFER_TYPE_ISOCHRONOUS), MaxPacketSize: 1024, MaxIsoPacket: 1024, }, { - Address: uint8(0x06 | ENDPOINT_DIR_IN), + Address: uint8(0x06 | EndpointDirectionIn), Attributes: uint8(TRANSFER_TYPE_ISOCHRONOUS), MaxPacketSize: 1024, MaxIsoPacket: 1024, diff --git a/usb/transfer_test.go b/usb/transfer_test.go index 4e4fcea..23452f1 100644 --- a/usb/transfer_test.go +++ b/usb/transfer_test.go @@ -37,7 +37,7 @@ func TestNewTransfer(t *testing.T) { }{ { desc: "bulk in transfer, 512B packets", - dir: ENDPOINT_DIR_IN, + dir: EndpointDirectionIn, tt: TRANSFER_TYPE_BULK, maxPkt: 512, buf: 1024, @@ -46,7 +46,7 @@ func TestNewTransfer(t *testing.T) { }, { desc: "iso out transfer, 3 * 1024B packets", - dir: ENDPOINT_DIR_OUT, + dir: EndpointDirectionOut, tt: TRANSFER_TYPE_ISOCHRONOUS, maxPkt: 2<<11 + 1024, maxIso: 3 * 1024,