Remove CMemorySystem member from all samples

The CMemorySystem class is instantiated early during system initialization in any case since Step 41.2, but in the sample programs there were still alias instances, which were obsolete. These will be removed now in all samples in sample/, addon/ and app/.
rsta2 · Mar 29, 2021 · ab6ca24 · ab6ca24
1 parent 91075a4
commit ab6ca24
Show file tree

Hide file tree

Showing 76 changed files with 17 additions and 146 deletions.
diff --git a/addon/OneWire/sample/kernel.h b/addon/OneWire/sample/kernel.h
@@ -4,7 +4,6 @@
 #ifndef _kernel_h
 #define _kernel_h
 
-#include <circle/memory.h>
 #include <circle/actled.h>
 #include <circle/koptions.h>
 #include <circle/devicenameservice.h>
@@ -37,7 +36,6 @@ class CKernel
 
 private:
 	// do not change this order
-	CMemorySystem		m_Memory;
 	CActLED			m_ActLED;
 	CKernelOptions		m_Options;
 	CDeviceNameService	m_DeviceNameService;

diff --git a/addon/Properties/sample/kernel.h b/addon/Properties/sample/kernel.h
@@ -20,7 +20,6 @@
 #ifndef _kernel_h
 #define _kernel_h
 
-#include <circle/memory.h>
 #include <circle/actled.h>
 #include <circle/koptions.h>
 #include <circle/devicenameservice.h>
@@ -58,7 +57,6 @@ class CKernel
 
 private:
 	// do not change this order
-	CMemorySystem		m_Memory;
 	CActLED			m_ActLED;
 	CKernelOptions		m_Options;
 	CDeviceNameService	m_DeviceNameService;

diff --git a/addon/SDCard/sample/kernel.h b/addon/SDCard/sample/kernel.h
@@ -20,7 +20,6 @@
 #ifndef _kernel_h
 #define _kernel_h
 
-#include <circle/memory.h>
 #include <circle/actled.h>
 #include <circle/koptions.h>
 #include <circle/devicenameservice.h>
@@ -53,7 +52,6 @@ class CKernel
 
 private:
 	// do not change this order
-	CMemorySystem		m_Memory;
 	CActLED			m_ActLED;
 	CKernelOptions		m_Options;
 	CDeviceNameService	m_DeviceNameService;

diff --git a/addon/Spectrum/sample/kernel.h b/addon/Spectrum/sample/kernel.h
@@ -20,7 +20,6 @@
 #ifndef _kernel_h
 #define _kernel_h
 
-#include <circle/memory.h>
 #include <circle/actled.h>
 #include <circle/devicenameservice.h>
 #include <circle/serial.h>
@@ -50,7 +49,6 @@ class CKernel
 
 private:
 	// do not change this order
-	CMemorySystem		m_Memory;
 	CActLED			m_ActLED;
 	CDeviceNameService	m_DeviceNameService;
 	CSerialDevice		m_Serial;

diff --git a/addon/WS28XX/sample/kernel.h b/addon/WS28XX/sample/kernel.h
@@ -20,7 +20,6 @@
 #ifndef _kernel_h
 #define _kernel_h
 
-#include <circle/memory.h>
 #include <circle/actled.h>
 #include <circle/koptions.h>
 #include <circle/devicenameservice.h>
@@ -52,7 +51,6 @@ class CKernel
 
 private:
 	// do not change this order
-	CMemorySystem		m_Memory;
 	CActLED			m_ActLED;
 	CKernelOptions		m_Options;
 	CDeviceNameService	m_DeviceNameService;

diff --git a/addon/dio/sample/kernel.h b/addon/dio/sample/kernel.h
@@ -20,7 +20,6 @@
 #ifndef _kernel_h
 #define _kernel_h
 
-#include <circle/memory.h>
 #include <circle/actled.h>
 #include <circle/koptions.h>
 #include <circle/devicenameservice.h>
@@ -53,7 +52,6 @@ class CKernel
 
 private:
 	// do not change this order
-	CMemorySystem		m_Memory;
 	CActLED			m_ActLED;
 	CKernelOptions		m_Options;
 	CDeviceNameService	m_DeviceNameService;

diff --git a/addon/display/sample/kernel.h b/addon/display/sample/kernel.h
@@ -20,7 +20,6 @@
 #ifndef _kernel_h
 #define _kernel_h
 
-#include <circle/memory.h>
 #include <circle/actled.h>
 #include <circle/koptions.h>
 #include <circle/devicenameservice.h>
@@ -58,7 +57,6 @@ class CKernel
 
 private:
 	// do not change this order
-	CMemorySystem		m_Memory;
 	CActLED			m_ActLED;
 	CKernelOptions		m_Options;
 	CDeviceNameService	m_DeviceNameService;

diff --git a/addon/fatfs/sample/kernel.h b/addon/fatfs/sample/kernel.h
@@ -20,7 +20,6 @@
 #ifndef _kernel_h
 #define _kernel_h
 
-#include <circle/memory.h>
 #include <circle/actled.h>
 #include <circle/koptions.h>
 #include <circle/devicenameservice.h>
@@ -54,7 +53,6 @@ class CKernel
 
 private:
 	// do not change this order
-	CMemorySystem		m_Memory;
 	CActLED			m_ActLED;
 	CKernelOptions		m_Options;
 	CDeviceNameService	m_DeviceNameService;

diff --git a/addon/gpio/sample/rtkgpio/kernel.h b/addon/gpio/sample/rtkgpio/kernel.h
@@ -20,7 +20,6 @@
 #ifndef _kernel_h
 #define _kernel_h
 
-#include <circle/memory.h>
 #include <circle/actled.h>
 #include <circle/koptions.h>
 #include <circle/devicenameservice.h>
@@ -52,7 +51,6 @@ class CKernel
 
 private:
 	// do not change this order
-	CMemorySystem		m_Memory;
 	CActLED			m_ActLED;
 	CKernelOptions		m_Options;
 	CDeviceNameService	m_DeviceNameService;

diff --git a/addon/lvgl/sample/kernel.h b/addon/lvgl/sample/kernel.h
@@ -20,7 +20,6 @@
 #ifndef _kernel_h
 #define _kernel_h
 
-#include <circle/memory.h>
 #include <circle/actled.h>
 #include <circle/koptions.h>
 #include <circle/devicenameservice.h>
@@ -54,7 +53,6 @@ class CKernel
 
 private:
 	// do not change this order
-	CMemorySystem		m_Memory;
 	CActLED			m_ActLED;
 	CKernelOptions		m_Options;
 	CDeviceNameService	m_DeviceNameService;

diff --git a/addon/microbit/sample/kernel.h b/addon/microbit/sample/kernel.h
@@ -20,7 +20,6 @@
 #ifndef _kernel_h
 #define _kernel_h
 
-#include <circle/memory.h>
 #include <circle/actled.h>
 #include <circle/koptions.h>
 #include <circle/devicenameservice.h>
@@ -53,7 +52,6 @@ class CKernel
 
 private:
 	// do not change this order
-	CMemorySystem		m_Memory;
 	CActLED			m_ActLED;
 	CKernelOptions		m_Options;
 	CDeviceNameService	m_DeviceNameService;

diff --git a/addon/profile/sample/kernel.h b/addon/profile/sample/kernel.h
@@ -20,7 +20,6 @@
 #ifndef _kernel_h
 #define _kernel_h
 
-#include <circle/memory.h>
 #include <circle/actled.h>
 #include <circle/koptions.h>
 #include <circle/devicenameservice.h>
@@ -57,7 +56,6 @@ class CKernel
 
 private:
 	// do not change this order
-	CMemorySystem		m_Memory;
 	CActLED			m_ActLED;
 	CKernelOptions		m_Options;
 	CDeviceNameService	m_DeviceNameService;

diff --git a/addon/qemu/gpiodemo/kernel.h b/addon/qemu/gpiodemo/kernel.h
@@ -20,7 +20,6 @@
 #ifndef _kernel_h
 #define _kernel_h
 
-#include <circle/memory.h>
 #include <circle/actled.h>
 #include <circle/devicenameservice.h>
 #include <circle/screen.h>
@@ -45,7 +44,6 @@ class CKernel
 
 private:
 	// do not change this order
-	CMemorySystem		m_Memory;
 	CActLED			m_ActLED;
 	CDeviceNameService	m_DeviceNameService;
 	CScreenDevice		m_Screen;

diff --git a/addon/qemu/hostlogdemo/kernel.h b/addon/qemu/hostlogdemo/kernel.h
@@ -20,7 +20,6 @@
 #ifndef _kernel_h
 #define _kernel_h
 
-#include <circle/memory.h>
 #include <circle/actled.h>
 #include <circle/koptions.h>
 #include <circle/devicenameservice.h>
@@ -53,7 +52,6 @@ class CKernel
 
 private:
 	// do not change this order
-	CMemorySystem		m_Memory;
 	CKernelOptions		m_Options;
 	CDeviceNameService	m_DeviceNameService;
 	CQEMUHostFile		m_LogFile;

diff --git a/addon/rtc/sample/kernel.h b/addon/rtc/sample/kernel.h
@@ -20,7 +20,6 @@
 #ifndef _kernel_h
 #define _kernel_h
 
-#include <circle/memory.h>
 #include <circle/actled.h>
 #include <circle/koptions.h>
 #include <circle/devicenameservice.h>
@@ -56,7 +55,6 @@ class CKernel
 
 private:
 	// do not change this order
-	CMemorySystem		m_Memory;
 	CActLED			m_ActLED;
 	CKernelOptions		m_Options;
 	CDeviceNameService	m_DeviceNameService;

diff --git a/addon/sensor/sample/bmp180/kernel.h b/addon/sensor/sample/bmp180/kernel.h
@@ -20,7 +20,6 @@
 #ifndef _kernel_h
 #define _kernel_h
 
-#include <circle/memory.h>
 #include <circle/actled.h>
 #include <circle/koptions.h>
 #include <circle/devicenameservice.h>
@@ -53,7 +52,6 @@ class CKernel
 
 private:
 	// do not change this order
-	CMemorySystem		m_Memory;
 	CActLED			m_ActLED;
 	CKernelOptions		m_Options;
 	CDeviceNameService	m_DeviceNameService;

diff --git a/addon/sensor/sample/hcsr04/kernel.h b/addon/sensor/sample/hcsr04/kernel.h
@@ -20,7 +20,6 @@
 #ifndef _kernel_h
 #define _kernel_h
 
-#include <circle/memory.h>
 #include <circle/actled.h>
 #include <circle/koptions.h>
 #include <circle/devicenameservice.h>
@@ -53,7 +52,6 @@ class CKernel
 
 private:
 	// do not change this order
-	CMemorySystem		m_Memory;
 	CActLED			m_ActLED;
 	CKernelOptions		m_Options;
 	CDeviceNameService	m_DeviceNameService;

diff --git a/addon/sensor/sample/mpu6050/kernel.h b/addon/sensor/sample/mpu6050/kernel.h
@@ -20,7 +20,6 @@
 #ifndef _kernel_h
 #define _kernel_h
 
-#include <circle/memory.h>
 #include <circle/actled.h>
 #include <circle/koptions.h>
 #include <circle/devicenameservice.h>
@@ -53,7 +52,6 @@ class CKernel
 
 private:
 	// do not change this order
-	CMemorySystem		m_Memory;
 	CActLED			m_ActLED;
 	CKernelOptions		m_Options;
 	CDeviceNameService	m_DeviceNameService;

diff --git a/addon/tftpfileserver/sample/kernel.h b/addon/tftpfileserver/sample/kernel.h
@@ -20,7 +20,6 @@
 #ifndef _kernel_h
 #define _kernel_h
 
-#include <circle/memory.h>
 #include <circle/actled.h>
 #include <circle/koptions.h>
 #include <circle/devicenameservice.h>
@@ -56,7 +55,6 @@ class CKernel
 
 private:
 	// do not change this order
-	CMemorySystem		m_Memory;
 	CActLED			m_ActLED;
 	CKernelOptions		m_Options;
 	CDeviceNameService	m_DeviceNameService;

diff --git a/addon/ugui/sample/kernel.h b/addon/ugui/sample/kernel.h
@@ -20,7 +20,6 @@
 #ifndef _kernel_h
 #define _kernel_h
 
-#include <circle/memory.h>
 #include <circle/actled.h>
 #include <circle/koptions.h>
 #include <circle/devicenameservice.h>
@@ -59,7 +58,6 @@ class CKernel
 
 private:
 	// do not change this order
-	CMemorySystem		m_Memory;
 	CActLED			m_ActLED;
 	CKernelOptions		m_Options;
 	CDeviceNameService	m_DeviceNameService;

diff --git a/addon/vc4/interface/sample/hello_dispmanx/kernel.cpp b/addon/vc4/interface/sample/hello_dispmanx/kernel.cpp
@@ -18,6 +18,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 #include "kernel.h"
+#include <circle/memory.h>
 
 extern "C" int _main (void);
 
@@ -27,7 +28,7 @@ CKernel::CKernel (void)
 :	m_Screen (m_Options.GetWidth (), m_Options.GetHeight ()),
 	m_Timer (&m_Interrupt),
 	m_Logger (m_Options.GetLogLevel (), &m_Timer),
-	m_VCHIQ (&m_Memory, &m_Interrupt)
+	m_VCHIQ (CMemorySystem::Get (), &m_Interrupt)
 {
 	m_ActLED.Blink (5);	// show we are alive
 }

diff --git a/addon/vc4/interface/sample/hello_dispmanx/kernel.h b/addon/vc4/interface/sample/hello_dispmanx/kernel.h
@@ -20,7 +20,6 @@
 #ifndef _kernel_h
 #define _kernel_h
 
-#include <circle/memory.h>
 #include <circle/actled.h>
 #include <circle/koptions.h>
 #include <circle/devicenameservice.h>
@@ -53,7 +52,6 @@ class CKernel
 
 private:
 	// do not change this order
-	CMemorySystem		m_Memory;
 	CActLED			m_ActLED;
 	CKernelOptions		m_Options;
 	CDeviceNameService	m_DeviceNameService;

diff --git a/addon/vc4/interface/sample/hello_tiger/kernel.cpp b/addon/vc4/interface/sample/hello_tiger/kernel.cpp
@@ -18,6 +18,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 #include "kernel.h"
+#include <circle/memory.h>
 
 extern "C" int _main (void);
 
@@ -27,7 +28,7 @@ CKernel::CKernel (void)
 :	m_Screen (m_Options.GetWidth (), m_Options.GetHeight ()),
 	m_Timer (&m_Interrupt),
 	m_Logger (m_Options.GetLogLevel (), &m_Timer),
-	m_VCHIQ (&m_Memory, &m_Interrupt)
+	m_VCHIQ (CMemorySystem::Get (), &m_Interrupt)
 {
 	m_ActLED.Blink (5);	// show we are alive
 }

diff --git a/addon/vc4/interface/sample/hello_tiger/kernel.h b/addon/vc4/interface/sample/hello_tiger/kernel.h
@@ -20,7 +20,6 @@
 #ifndef _kernel_h
 #define _kernel_h
 
-#include <circle/memory.h>
 #include <circle/actled.h>
 #include <circle/koptions.h>
 #include <circle/devicenameservice.h>
@@ -53,7 +52,6 @@ class CKernel
 
 private:
 	// do not change this order
-	CMemorySystem		m_Memory;
 	CActLED			m_ActLED;
 	CKernelOptions		m_Options;
 	CDeviceNameService	m_DeviceNameService;