From 90935703e66ab02aac5bcbdc007bf4605683c023 Mon Sep 17 00:00:00 2001
From: deadprogram <ron@hybridgroup.com>
Date: Fri, 28 Apr 2023 21:36:18 +0200
Subject: [PATCH] machine/usb/descriptor: rename and export Append() to make it
 easier to create new descriptors in user code

Signed-off-by: deadprogram <ron@hybridgroup.com>
---
 src/machine/usb/descriptor/cdc.go        | 2 +-
 src/machine/usb/descriptor/descriptor.go | 2 +-
 src/machine/usb/descriptor/hid.go        | 4 ++--
 src/machine/usb/descriptor/joystick.go   | 4 ++--
 src/machine/usb/descriptor/midi.go       | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/machine/usb/descriptor/cdc.go b/src/machine/usb/descriptor/cdc.go
index a44b94ae..ec72186e 100644
--- a/src/machine/usb/descriptor/cdc.go
+++ b/src/machine/usb/descriptor/cdc.go
@@ -152,7 +152,7 @@ var InterfaceCDCData = InterfaceType{
 
 var CDC = Descriptor{
 	Device: DeviceCDC.Bytes(),
-	Configuration: appendSlices([][]byte{
+	Configuration: Append([][]byte{
 		ConfigurationCDC.Bytes(),
 		InterfaceAssociationCDC.Bytes(),
 		InterfaceCDCControl.Bytes(),
diff --git a/src/machine/usb/descriptor/descriptor.go b/src/machine/usb/descriptor/descriptor.go
index 5b52edb2..852ddab6 100644
--- a/src/machine/usb/descriptor/descriptor.go
+++ b/src/machine/usb/descriptor/descriptor.go
@@ -46,7 +46,7 @@ func (d *Descriptor) Configure(idVendor, idProduct uint16) {
 	conf.TotalLength(uint16(len(d.Configuration)))
 }
 
-func appendSlices[T any](slices [][]T) []T {
+func Append[T any](slices [][]T) []T {
 	var size, pos int
 
 	for _, s := range slices {
diff --git a/src/machine/usb/descriptor/hid.go b/src/machine/usb/descriptor/hid.go
index 197a45da..d1cf1f08 100644
--- a/src/machine/usb/descriptor/hid.go
+++ b/src/machine/usb/descriptor/hid.go
@@ -113,7 +113,7 @@ var ClassHID = ClassHIDType{
 
 var CDCHID = Descriptor{
 	Device: DeviceCDC.Bytes(),
-	Configuration: appendSlices([][]byte{
+	Configuration: Append([][]byte{
 		ConfigurationCDCHID.Bytes(),
 		InterfaceAssociationCDC.Bytes(),
 		InterfaceCDCControl.Bytes(),
@@ -130,7 +130,7 @@ var CDCHID = Descriptor{
 		EndpointEP4IN.Bytes(),
 	}),
 	HID: map[uint16][]byte{
-		2: appendSlices([][]byte{
+		2: Append([][]byte{
 			HIDUsagePageGenericDesktop,
 			HIDUsageDesktopKeyboard,
 			HIDCollectionApplication,
diff --git a/src/machine/usb/descriptor/joystick.go b/src/machine/usb/descriptor/joystick.go
index 068838a6..eb761556 100644
--- a/src/machine/usb/descriptor/joystick.go
+++ b/src/machine/usb/descriptor/joystick.go
@@ -68,7 +68,7 @@ var ClassHIDJoystick = ClassHIDType{
 	data: classHIDJoystick[:],
 }
 
-var JoystickDefaultHIDReport = appendSlices([][]byte{
+var JoystickDefaultHIDReport = Append([][]byte{
 	HIDUsagePageGenericDesktop,
 	HIDUsageDesktopJoystick,
 	HIDCollectionApplication,
@@ -136,7 +136,7 @@ var JoystickDefaultHIDReport = appendSlices([][]byte{
 // custom configurations.
 var CDCJoystick = Descriptor{
 	Device: DeviceJoystick.Bytes(),
-	Configuration: appendSlices([][]byte{
+	Configuration: Append([][]byte{
 		ConfigurationCDCJoystick.Bytes(),
 		InterfaceAssociationCDC.Bytes(),
 		InterfaceCDCControl.Bytes(),
diff --git a/src/machine/usb/descriptor/midi.go b/src/machine/usb/descriptor/midi.go
index 658aec85..fad81f31 100644
--- a/src/machine/usb/descriptor/midi.go
+++ b/src/machine/usb/descriptor/midi.go
@@ -220,7 +220,7 @@ var ConfigurationCDCMIDI = ConfigurationType{
 
 var CDCMIDI = Descriptor{
 	Device: DeviceCDC.Bytes(),
-	Configuration: appendSlices([][]byte{
+	Configuration: Append([][]byte{
 		ConfigurationCDCMIDI.Bytes(),
 		InterfaceAssociationCDC.Bytes(),
 		InterfaceCDCControl.Bytes(),