From 8c54eac1675f71892207bc398d5211ef37384f95 Mon Sep 17 00:00:00 2001
From: Adrian <adrian@rydeas.com>
Date: Fri, 24 Jan 2025 19:34:35 -0600
Subject: [PATCH] cleanup

---
 usb.go | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/usb.go b/usb.go
index 0d362e9..35147c4 100644
--- a/usb.go
+++ b/usb.go
@@ -89,7 +89,7 @@ func UpdateGadgetConfig() error {
 		return err
 	}
 
-	log.Printf("Successfully updated string attributes: %s", strAttrs)
+	log.Printf("Successfully updated usb string attributes: %s", strAttrs)
 
 	err = rebindUsb()
 	if err != nil {
@@ -120,35 +120,30 @@ func writeGadgetConfig() error {
 		return err
 	}
 
-	LoadConfig()
-	gadgetAttrs := [][]string{
-		{"bcdUSB", "0x0200"}, //USB 2.0
-		{"idVendor", "0x1d6b"},
-		{"idProduct", "0104"},
+	err = writeGadgetAttrs(kvmGadgetPath, [][]string{
+		{"bcdUSB", "0x0200"},   //USB 2.0
+		{"idVendor", "0x1d6b"}, //The Linux Foundation
+		{"idProduct", "0104"},  //Multifunction Composite Gadget¬
 		{"bcdDevice", "0100"},
-	}
-	err = writeGadgetAttrs(kvmGadgetPath, gadgetAttrs)
+	})
 	if err != nil {
 		return err
 	}
 
-	logger.Infof("Successfully wrote gadget attributes: %s", gadgetAttrs)
 	gadgetStringsPath := filepath.Join(kvmGadgetPath, "strings", "0x409")
 	err = os.MkdirAll(gadgetStringsPath, 0755)
 	if err != nil {
 		return err
 	}
 
-	strAttrs := [][]string{
+	err = writeGadgetAttrs(gadgetStringsPath, [][]string{
 		{"serialnumber", GetDeviceID()},
 		{"manufacturer", "JetKVM"},
 		{"product", "JetKVM USB Emulation Device"},
-	}
-	err = writeGadgetAttrs(gadgetStringsPath, strAttrs)
+	})
 	if err != nil {
 		return err
 	}
-	logger.Infof("Successfully wrote string attributes: %s", strAttrs)
 
 	configC1StringsPath := path.Join(configC1Path, "strings", "0x409")
 	err = os.MkdirAll(configC1StringsPath, 0755)