Michel2/mt32-pi
1
0 Fork 0
mirror of https://github.com/dwhinham/mt32-pi.git synced 2026-10-26 22:11:05 +00:00
Code Wiki Activity

Update to circle-stdlib v15.10/Circle Step 44.3

Browse Source
This commit is contained in:
Dale Whinham committed 2021-12-05 20:40:17 +00:00
1 parent a9459107de
commit dc6d6fd31d
4 files changed
+10 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

CHANGELOG.md
+1 -1
View File
@@ -14,7 +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 circle-stdlib v15.10/Circle Step 44.3.
- Update ARM toolchains to 10.3-2021.07.
- Update to libmt32emu v2.5.3.
- Update to FluidSynth v2.2.4.
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.2-minimal-usb-drivers.patch
@patch -N -p1 --no-backup-if-mismatch -r - -d $(CIRCLEHOME) < patches/circle-44.3-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.2-minimal-usb-drivers.patch
@patch -R -N -p1 --no-backup-if-mismatch -r - -d $(CIRCLEHOME) < patches/circle-44.3-minimal-usb-drivers.patch
@patch -R -N -p1 --no-backup-if-mismatch -r - -d $(FLUIDSYNTHHOME) < patches/fluidsynth-2.2.4-circle.patch
# Clean circle-stdlib
external/circle-stdlib
Vendored
+1 -1
Submodule external/circle-stdlib updated: 35f16742b7...47d9deb580.
patches/circle-44.2-minimal-usb-drivers.patch → patches/circle-44.3-minimal-usb-drivers.patch
+6 -6
View File
@@ -29,10 +29,10 @@ index 59a1fa7..2f4e334 100644
usbserialpl2303.o usbserialft231x.o usbserialcdc.o usbtouchscreen.o
diff --git a/lib/usb/usbdevicefactory.cpp b/lib/usb/usbdevicefactory.cpp
index 7cc1a2f..2715670 100644
index 432a3ec..8cfb35c 100644
--- a/lib/usb/usbdevicefactory.cpp
+++ b/lib/usb/usbdevicefactory.cpp
@@ -62,6 +62,7 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
@@ -74,6 +74,7 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
{
pResult = new CUSBBulkOnlyMassStorageDevice (pParent);
}
@@ -40,7 +40,7 @@ index 7cc1a2f..2715670 100644
else if (pName->Compare ("int3-1-1") == 0)
{
pResult = new CUSBKeyboardDevice (pParent);
@@ -104,6 +105,7 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
@@ -116,6 +117,7 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
{
pResult = new CUSBPrinterDevice (pParent);
}
@@ -48,7 +48,7 @@ index 7cc1a2f..2715670 100644
else if (pName->Compare ("ven424-ec00") == 0)
{
pResult = new CSMSC951xDevice (pParent);
@@ -112,11 +114,13 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
@@ -124,11 +126,13 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
{
pResult = new CLAN7800Device (pParent);
}
@@ -62,7 +62,7 @@ index 7cc1a2f..2715670 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
@@ -171,6 +175,7 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
return pResult;
}
@@ -70,7 +70,7 @@ index 7cc1a2f..2715670 100644
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)
@@ -249,6 +254,7 @@ CUSBFunction *CUSBDeviceFactory::GetGenericHIDDevice (CUSBFunction *pParent)
return new CUSBGamePadStandardDevice (pParent);
}