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.14/Circle Step 45

Browse Source
This commit is contained in:
Dale Whinham committed 2022-12-04 22:24:06 +00:00
1 parent 772fb15d1b
commit 55588f8201
10 files changed
+42 -41
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

CHANGELOG.md
+1
View File
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- Update to circle-stdlib v15.14/Circle Step 45.
- Update to libmt32emu v2.7.0.
- Update to FluidSynth v2.3.0.
- Update to inih r56.
Kernel.mk
+1
View File
@@ -68,6 +68,7 @@ LIBS := $(CIRCLE_STDLIB_LIBS) \
$(CIRCLEHOME)/lib/libcircle.a \
$(CIRCLEHOME)/lib/net/libnet.a \
$(CIRCLEHOME)/lib/sched/libsched.a \
$(CIRCLEHOME)/lib/sound/libsound.a \
$(CIRCLEHOME)/lib/usb/libusb.a
ifeq ($(HDMI_CONSOLE), 1)
Makefile
+6 -6
View File
@@ -34,9 +34,9 @@ $(CIRCLE_STDLIB_CONFIG) $(CIRCLE_CONFIG)&:
$(CIRCLESTDLIBHOME)/configure --raspberrypi=$(RASPBERRYPI) --prefix=$(PREFIX)
# Apply patches
@${APPLY_PATCH} $(CIRCLEHOME) patches/circle-44.4-minimal-usb-drivers.patch
@${APPLY_PATCH} $(CIRCLEHOME) patches/circle-44.5-usb-midi-interrupt-ep.patch
@${APPLY_PATCH} $(CIRCLEHOME) patches/circle-44.5-cp210x-remove-partnum-check.patch
@${APPLY_PATCH} $(CIRCLEHOME) patches/circle-45-minimal-usb-drivers.patch
@${APPLY_PATCH} $(CIRCLEHOME) patches/circle-45-cp210x-remove-partnum-check.patch
@${APPLY_PATCH} $(CIRCLEHOME) patches/circle-45-fix-missing-struct-init.patch
ifeq ($(strip $(GC_SECTIONS)),1)
# Enable function/data sections for circle-stdlib
@@ -141,9 +141,9 @@ clean:
#
veryclean: clean
# Reverse patches
@${REVERSE_PATCH} $(CIRCLEHOME) patches/circle-44.5-cp210x-remove-partnum-check.patch
@${REVERSE_PATCH} $(CIRCLEHOME) patches/circle-44.5-usb-midi-interrupt-ep.patch
@${REVERSE_PATCH} $(CIRCLEHOME) patches/circle-44.4-minimal-usb-drivers.patch
@${REVERSE_PATCH} $(CIRCLEHOME) patches/circle-45-fix-missing-struct-init.patch
@${REVERSE_PATCH} $(CIRCLEHOME) patches/circle-45-cp210x-remove-partnum-check.patch
@${REVERSE_PATCH} $(CIRCLEHOME) patches/circle-45-minimal-usb-drivers.patch
@${REVERSE_PATCH} $(FLUIDSYNTHHOME) patches/fluidsynth-2.3.0-circle.patch
# Clean circle-stdlib
external/circle-stdlib
Vendored
+1 -1
Submodule external/circle-stdlib updated: 09d328c28f...a281592c9b.
include/mt32pi.h
+1 -1
View File
@@ -35,7 +35,7 @@
#include <circle/multicore.h>
#include <circle/net/netsubsystem.h>
#include <circle/sched/scheduler.h>
#include <circle/soundbasedevice.h>
#include <circle/sound/soundbasedevice.h>
#include <circle/spimaster.h>
#include <circle/timer.h>
#include <circle/types.h>
patches/circle-44.5-usb-midi-interrupt-ep.patch
-23
View File
@@ -1,23 +0,0 @@
From 646c3629a4cb44a1948819048a3fe2f365a1b568 Mon Sep 17 00:00:00 2001
From: Rene Stange <rsta2@o2online.de>
Date: Sat, 24 Sep 2022 14:55:30 +0200
Subject: [PATCH] usb/usbmidi: Allow to use Interrupt EPs
Issue #316
---
lib/usb/usbmidi.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/usb/usbmidi.cpp b/lib/usb/usbmidi.cpp
index b828c535..a0cc58c5 100644
--- a/lib/usb/usbmidi.cpp
+++ b/lib/usb/usbmidi.cpp
@@ -109,7 +109,7 @@ boolean CUSBMIDIDevice::Configure (void)
TUSBAudioEndpointDescriptor *pEndpointDesc;
while ((pEndpointDesc = (TUSBAudioEndpointDescriptor *) GetDescriptor (DESCRIPTOR_ENDPOINT)) != 0)
{
- if ((pEndpointDesc->bmAttributes & 0x3F) != 0x02) // Bulk EP
+ if ((pEndpointDesc->bmAttributes & 0x3E) != 0x02) // Bulk or Interrupt EP
{
continue;
}
patches/circle-44.5-cp210x-remove-partnum-check.patch → patches/circle-45-cp210x-remove-partnum-check.patch
View File
File renamed without changes.
patches/circle-45-fix-missing-struct-init.patch
+22
View File
@@ -0,0 +1,22 @@
From 26fef0f51d9a4fb2fc65a0c4abaf29c64ed5dea7 Mon Sep 17 00:00:00 2001
From: Dale Whinham <daleyo@gmail.com>
Date: Sun, 4 Dec 2022 22:09:40 +0000
Subject: [PATCH] FIXED: soundcontroller: missing field initializers
---
include/circle/sound/soundcontroller.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/circle/sound/soundcontroller.h b/include/circle/sound/soundcontroller.h
index cc578fbc..193a82ce 100644
--- a/include/circle/sound/soundcontroller.h
+++ b/include/circle/sound/soundcontroller.h
@@ -104,7 +104,7 @@ class CSoundController /// Optional controller of a sound device
/// \return Info about the control in the selected configuration
/// \note A control may be supported for ChannelAll, but not for ChannelLeft/Right.
virtual const TControlInfo GetControlInfo (TControl Control, TJack Jack,
- TChannel Channel) const { return { FALSE }; }
+ TChannel Channel) const { return { FALSE, 0, 0 }; }
/// \param Control Control selector
/// \param Jack Affected jack
/// \param Channel Affected channel(s)
patches/circle-44.4-minimal-usb-drivers.patch → patches/circle-45-minimal-usb-drivers.patch
+7 -7
View File
@@ -14,7 +14,7 @@ index b0ca55f..5a3d2ae 100644
static boolean FindDeviceID (CString *pName, const TUSBDeviceID *pIDTable);
};
diff --git a/lib/usb/Makefile b/lib/usb/Makefile
index 59a1fa7..2f4e334 100644
index 87ffc8e..f171163 100644
--- a/lib/usb/Makefile
+++ b/lib/usb/Makefile
@@ -26,9 +26,7 @@ include $(CIRCLEHOME)/Rules.mk
@@ -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 150ade3..8240548 100644
index e501491..eda4b58 100644
--- a/lib/usb/usbdevicefactory.cpp
+++ b/lib/usb/usbdevicefactory.cpp
@@ -74,6 +74,7 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
@@ -77,6 +77,7 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
{
pResult = new CUSBBulkOnlyMassStorageDevice (pParent);
}
@@ -40,7 +40,7 @@ index 150ade3..8240548 100644
else if (pName->Compare ("int3-1-1") == 0)
{
CString *pVendor = pParent->GetDevice ()->GetName (DeviceNameVendor);
@@ -132,6 +133,7 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
@@ -136,6 +137,7 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
{
pResult = new CUSBPrinterDevice (pParent);
}
@@ -48,7 +48,7 @@ index 150ade3..8240548 100644
else if (pName->Compare ("ven424-ec00") == 0)
{
pResult = new CSMSC951xDevice (pParent);
@@ -140,11 +142,13 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
@@ -144,11 +146,13 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
{
pResult = new CLAN7800Device (pParent);
}
@@ -62,7 +62,7 @@ index 150ade3..8240548 100644
else if ( pName->Compare ("int1-3-0") == 0
|| pName->Compare ("ven582-12a") == 0) // Roland UM-ONE MIDI interface
{
@@ -187,6 +191,7 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
@@ -203,6 +207,7 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
return pResult;
}
@@ -70,7 +70,7 @@ index 150ade3..8240548 100644
CUSBFunction *CUSBDeviceFactory::GetGenericHIDDevice (CUSBFunction *pParent)
{
// Must copy parent function here, because we consume the HID report descriptor,
@@ -265,6 +270,7 @@ CUSBFunction *CUSBDeviceFactory::GetGenericHIDDevice (CUSBFunction *pParent)
@@ -281,6 +286,7 @@ CUSBFunction *CUSBDeviceFactory::GetGenericHIDDevice (CUSBFunction *pParent)
return new CUSBGamePadStandardDevice (pParent);
}
src/mt32pi.cpp
+3 -3
View File
@@ -20,11 +20,11 @@
// mt32-pi. If not, see <http://www.gnu.org/licenses/>.
//
#include <circle/hdmisoundbasedevice.h>
#include <circle/i2ssoundbasedevice.h>
#include <circle/memory.h>
#include <circle/pwmsoundbasedevice.h>
#include <circle/serial.h>
#include <circle/sound/hdmisoundbasedevice.h>
#include <circle/sound/i2ssoundbasedevice.h>
#include <circle/sound/pwmsoundbasedevice.h>
#include <cstdarg>