Move "usb" config option to the system section

We now support more than just USB MIDI devices, so it no longer makes
sense to keep this in the MIDI section.

Author: dwhinham

CHANGELOG.md

@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Update to FluidSynth v2.1.8.
 - Update ARM toolchains to 10.2-2020.11.
 - Config file options are now case-insensitive.
+- The `usb` configuration option has been moved to the `[system]` section. Please update your configuration file if you use this option.
 
 ### Fixed
 

include/config.def

@@ -37,12 +37,12 @@
 
 BEGIN_SECTION(system)
 CFG(default_synth,			TSystemDefaultSynth,		SystemDefaultSynth,			TSystemDefaultSynth::MT32				)
+CFG(usb,					bool,						SystemUSB,					true									)
 CFG(i2c_baud_rate,			int,						SystemI2CBaudRate,			400000									)
 CFG(power_save_timeout,		int,						SystemPowerSaveTimeout,		300										)
 END_SECTION
 
 BEGIN_SECTION(midi)
-CFG(usb,					bool,						MIDIUSB,					true									)
 CFG(gpio_baud_rate,			int,						MIDIGPIOBaudRate,			31250									)
 CFG(gpio_thru,				bool,						MIDIGPIOThru,				false									)
 END_SECTION

sdcard/mt32-pi.cfg

@@ -25,6 +25,13 @@
 # soundfont: Use FluidSynth for SoundFont synthesis
 default_synth = mt32
 
+# Enable or disable support for USB devices.
+#
+# Disable this to speed up boot time if you are not using any USB devices.
+#
+# Values: on*, off
+usb = on
+
 # Set the I2C baud rate/clock speed for all peripherals (Hz).
 #
 # Most peripherals will work fine at the default speed (400KHz "fast mode"),
@@ -55,15 +62,6 @@ power_save_timeout = 300
 # MIDI options
 # -----------------------------------------------------------------------------
 [midi]
-
-# Enable or disable searching for a USB MIDI interface on startup.
-#
-# Disable this to speed up boot time if you are using GPIO for MIDI.
-# If no USB MIDI devices are detected, GPIO will be used as a fallback.
-#
-# Values: on*, off
-usb = on
-
 # Set the baud rate used for GPIO MIDI.
 #
 # For connecting to standard MIDI devices (i.e. via DIN cable), this should be

src/mt32pi.cpp

@@ -152,7 +152,7 @@ bool CMT32Pi::Initialize(bool bSerialMIDIAvailable)
 	// the initialization must be skipped in this case, or an
 	// exit happens here under 64-bit QEMU.
 	LCDLog(TLCDLogType::Startup, "Init USB");
-	if (pConfig->MIDIUSB)
+	if (pConfig->SystemUSB)
 	{
 		if (!m_pUSBHCI->Initialize())
 			return false;
@@ -359,7 +359,7 @@ void CMT32Pi::MainTask()
 		}
 
 		// Check for USB PnP events
-		if (CConfig::Get()->MIDIUSB)
+		if (CConfig::Get()->SystemUSB)
 			UpdateUSB();
 	}