Michel2/mt32-pi
1
0 Fork 0
mirror of https://github.com/dwhinham/mt32-pi.git synced 2026-10-27 06:21:59 +00:00
Code Wiki Activity

Update to circle-stdlib v15.9/Circle Step 44.2

Browse Source
This commit is contained in:
Dale Whinham committed 2021-11-07 20:46:58 +00:00
1 parent 0842145b86
commit b25a4972e3
4 files changed
+41 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

CHANGELOG.md
+1
View File
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- Update to circle-stdlib v15.9/Circle Step 44.2.
- Update to libmt32emu v2.5.3.
- Update to FluidSynth v2.2.3.
Makefile
+2 -2
View File
@@ -16,7 +16,7 @@ $(CIRCLE_STDLIB_CONFIG) $(CIRCLE_CONFIG)&:
$(CIRCLESTDLIBHOME)/configure --raspberrypi=$(RASPBERRYPI) --prefix=$(PREFIX)
# Apply patches
@patch -N -p1 --no-backup-if-mismatch -r - -d $(CIRCLEHOME) < patches/circle-44-minimal-usb-drivers.patch
@patch -N -p1 --no-backup-if-mismatch -r - -d $(CIRCLEHOME) < patches/circle-44.2-minimal-usb-drivers.patch
ifeq ($(strip $(GC_SECTIONS)),1)
# Enable function/data sections for circle-stdlib
@@ -117,7 +117,7 @@ clean:
#
veryclean: clean
# Reverse patches
@patch -R -N -p1 --no-backup-if-mismatch -r - -d $(CIRCLEHOME) < patches/circle-44-minimal-usb-drivers.patch
@patch -R -N -p1 --no-backup-if-mismatch -r - -d $(CIRCLEHOME) < patches/circle-44.2-minimal-usb-drivers.patch
@patch -R -N -p1 --no-backup-if-mismatch -r - -d $(FLUIDSYNTHHOME) < patches/fluidsynth-2.2.3-circle.patch
# Clean circle-stdlib
external/circle-stdlib
Vendored
+1 -1
Submodule external/circle-stdlib updated: 86094cfbd8...35f16742b7.
patches/circle-44-minimal-usb-drivers.patch → patches/circle-44.2-minimal-usb-drivers.patch
+37 -6
View File
@@ -1,5 +1,20 @@
diff --git a/include/circle/usb/usbdevicefactory.h b/include/circle/usb/usbdevicefactory.h
index b0ca55f..5a3d2ae 100644
--- a/include/circle/usb/usbdevicefactory.h
+++ b/include/circle/usb/usbdevicefactory.h
@@ -38,8 +38,10 @@ public:
static CUSBFunction *GetDevice (CUSBFunction *pParent, CString *pName);
private:
+#if 0
// for "int3-0-0" devices
static CUSBFunction *GetGenericHIDDevice (CUSBFunction *pParent);
+#endif
static boolean FindDeviceID (CString *pName, const TUSBDeviceID *pIDTable);
};
diff --git a/lib/usb/Makefile b/lib/usb/Makefile
index 88c33b4..d297087 100644
index 59a1fa7..2f4e334 100644
--- a/lib/usb/Makefile
+++ b/lib/usb/Makefile
@@ -26,9 +26,7 @@ include $(CIRCLEHOME)/Rules.mk
@@ -11,13 +26,13 @@ index 88c33b4..d297087 100644
- usbkeyboard.o usbmassdevice.o usbmidi.o usbmouse.o usbprinter.o usbrequest.o \
+ usbhiddevice.o usbhostcontroller.o usbkeyboard.o usbmassdevice.o usbmidi.o usbrequest.o \
usbstandardhub.o usbstring.o usbserial.o usbserialch341.o usbserialcp2102.o \
usbserialpl2303.o usbserialft231x.o usbserialcdc.o
usbserialpl2303.o usbserialft231x.o usbserialcdc.o usbtouchscreen.o
diff --git a/lib/usb/usbdevicefactory.cpp b/lib/usb/usbdevicefactory.cpp
index c67f36f..16388e1 100644
index 7cc1a2f..2715670 100644
--- a/lib/usb/usbdevicefactory.cpp
+++ b/lib/usb/usbdevicefactory.cpp
@@ -59,6 +59,7 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
@@ -62,6 +62,7 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
{
pResult = new CUSBBulkOnlyMassStorageDevice (pParent);
}
@@ -25,7 +40,7 @@ index c67f36f..16388e1 100644
else if (pName->Compare ("int3-1-1") == 0)
{
pResult = new CUSBKeyboardDevice (pParent);
@@ -101,6 +102,7 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
@@ -104,6 +105,7 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
{
pResult = new CUSBPrinterDevice (pParent);
}
@@ -33,7 +48,7 @@ index c67f36f..16388e1 100644
else if (pName->Compare ("ven424-ec00") == 0)
{
pResult = new CSMSC951xDevice (pParent);
@@ -109,11 +111,13 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
@@ -112,11 +114,13 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
{
pResult = new CLAN7800Device (pParent);
}
@@ -47,3 +62,19 @@ index c67f36f..16388e1 100644
else if ( pName->Compare ("int1-3-0") == 0
|| pName->Compare ("ven582-12a") == 0) // Roland UM-ONE MIDI interface
{
@@ -159,6 +163,7 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
return pResult;
}
+#if 0
CUSBFunction *CUSBDeviceFactory::GetGenericHIDDevice (CUSBFunction *pParent)
{
// Must copy parent function here, because we consume the HID report descriptor,
@@ -237,6 +242,7 @@ CUSBFunction *CUSBDeviceFactory::GetGenericHIDDevice (CUSBFunction *pParent)
return new CUSBGamePadStandardDevice (pParent);
}
+#endif
boolean CUSBDeviceFactory::FindDeviceID (CString *pName, const TUSBDeviceID *pIDTable)
{