Merge branch 'release-46'

Author: rsta2

CHANGELOG.md

@@ -3,9 +3,22 @@ Change Log
 
 This file contains the release notes (the major changes) since Circle Step30 for quick access. For earlier releases please checkout the respective git tag and look into README.md. More info is attached to the release tags (git cat-file tag StepNN) and is available in the git commit log.
 
+The 46th Step
+-------------
+
+With this release Circle initially **supports the Raspberry Pi 5**. There are many features, which are not available yet, but important features like USB and networking are supported. Please see the [Circle documentation](https://circle-rpi.readthedocs.io/en/46.0/appendices/raspberry-pi-5.html) for more information on Raspberry Pi 5 support!
+
+Circle comes with an **USB serial CDC gadget** now, which allows to communicate with a Circle application from a host computer via a serial interface without an USB serial adapter. This can be tested with the [test/usb-serial-cdc-gadget](test/usb-serial-cdc-gadget/).
+
+The **properties file library** in [addon/Properties](addon/Properties/) supports section headers now.
+
+A possible race condition in `CTimer` has been fixed, which could only occur with the KY-040 rotary encoder module driver.
+
 Release 45.3.1
 --------------
 
+2023-10-08
+
 This is a hotfix release. It fixes the release of guard structures, which are used to protect static objects, which are defined inside of a function. This problem did occur only, when the system option `ARM_ALLOW_MULTI_CORE` was defined.
 
 Release 45.3

CREDITS

@@ -87,6 +87,7 @@ Adding screen ANSI colors
 Providing info patch for I2S input
 Providing patch for WLAN AP mode
 Adding SMI master driver and WS2812OverSMI addon
+USB CDC ACM (serial) gadget driver
 
 Maciej Sokolowski
 Adding WM8960 support to I2S sound driver
@@ -103,3 +104,10 @@ Adding support for Ctrl+navigation keys
 
 @ArnoldUK
 Testing the resizing of the screen in different classes
+
+@aniplay62
+Providing U-Boot driver for MACB / GEM Ethernet NIC for Raspberry Pi 5
+Helping to get WLAN working on Raspberry Pi 5
+
+Joe Strout
+Providing Dvorak keyboard layout

Doxyfile

@@ -1183,7 +1183,7 @@ HTML_COLORSTYLE_GAMMA  = 80
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_TIMESTAMP         = YES
+#HTML_TIMESTAMP         = YES
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
@@ -1776,7 +1776,7 @@ LATEX_BIB_STYLE        = plain
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_TIMESTAMP        = NO
+#LATEX_TIMESTAMP        = NO
 
 #---------------------------------------------------------------------------
 # Configuration options related to the RTF output

README.md

@@ -2,7 +2,7 @@
 # Rules.mk
 #
 # Circle - A C++ bare metal environment for Raspberry Pi
-# Copyright (C) 2014-2023  R. Stange <rsta2@o2online.de>
+# Copyright (C) 2014-2024  R. Stange <rsta2@o2online.de>
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-CIRCLEVER = 450301
+CIRCLEVER = 460000
 
 CIRCLEHOME ?= ..
 
@@ -111,8 +111,12 @@ else ifeq ($(strip $(RASPPI)),4)
 ARCHCPU	?= -mcpu=cortex-a72 -mlittle-endian
 ARCH	+= -DAARCH=64 $(ARCHCPU)
 TARGET	?= kernel8-rpi4
+else ifeq ($(strip $(RASPPI)),5)
+ARCHCPU	?= -mcpu=cortex-a76 -mlittle-endian
+ARCH	+= -DAARCH=64 $(ARCHCPU)
+TARGET	?= kernel_2712
 else
-$(error RASPPI must be set to 3 or 4)
+$(error RASPPI must be set to 3, 4 or 5)
 endif
 PREFIX	= $(PREFIX64)
 LOADADDR = 0x80000

Rules.mk

@@ -2,7 +2,7 @@
 // properties.cpp
 //
 // Circle - A C++ bare metal environment for Raspberry Pi
-// Copyright (C) 2016-2021  R. Stange <rsta2@o2online.de>
+// Copyright (C) 2016-2023  R. Stange <rsta2@o2online.de>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -18,18 +18,30 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 #include <Properties/properties.h>
+#include <circle/ptrarray.h>
 #include <circle/util.h>
 #include <circle/logger.h>
 #include <assert.h>
 
+struct TSection
+{
+	CString Name;
+	CPtrArray PropArray;
+};
+
 struct TPropertyPair
 {
 	char *pName;
 	char *pValue;
 };
 
+const char CProperties::DefaultSection[] = "";
+
 CProperties::CProperties (void)
-:	m_nGetIndex (0)
+:	m_CurrentSectionName (DefaultSection),
+	m_pCurrentSection (nullptr),
+	m_pGetSection (nullptr),
+	m_nGetIndex (0)
 {
 }
 
@@ -38,6 +50,13 @@ CProperties::~CProperties (void)
 	RemoveAll ();
 }
 
+void CProperties::SelectSection (const char *pSectionName)
+{
+	m_CurrentSectionName = pSectionName;
+
+	m_pCurrentSection = LookupSection (pSectionName);
+}
+
 boolean CProperties::IsSet (const char *pPropertyName) const
 {
 	return Lookup (pPropertyName) != 0;
@@ -214,20 +233,35 @@ void CProperties::SetIPAddress (const char *pPropertyName, const u8 *pAddress)
 
 void CProperties::RemoveAll (void)
 {
-	for (unsigned i = 0; i < m_PropArray.GetCount (); i++)
+	TPtrListElement *pElement;
+	while ((pElement  = m_SectionList.GetFirst ()) !=  0)
 	{
-		TPropertyPair *pProperty = (TPropertyPair *) m_PropArray[i];
-		assert (pProperty != 0);
+		TSection *pSection = (TSection *) m_SectionList.GetPtr (pElement);
+		assert (pSection != 0);
+		CPtrArray *pPropArray = &pSection->PropArray;
 
-		delete [] (char *) pProperty->pName;
-		delete [] (char *) pProperty->pValue;
-		delete pProperty;
-	}
+		for (unsigned i = 0; i < pPropArray->GetCount (); i++)
+		{
+			TPropertyPair *pProperty = (TPropertyPair *) (*pPropArray)[i];
+			assert (pProperty != 0);
 
-	while (m_PropArray.GetCount () > 0)
-	{
-		m_PropArray.RemoveLast ();
+			delete [] (char *) pProperty->pName;
+			delete [] (char *) pProperty->pValue;
+			delete pProperty;
+		}
+
+		while (pPropArray->GetCount () > 0)
+		{
+			pPropArray->RemoveLast ();
+		}
+
+		delete pSection;
+
+		m_SectionList.Remove (pElement);
 	}
+
+	m_CurrentSectionName = DefaultSection;
+	m_pCurrentSection = nullptr;
 }
 
 void CProperties::AddProperty (const char*pPropertyName, const char *pValue)
@@ -252,27 +286,97 @@ void CProperties::AddProperty (const char*pPropertyName, const char *pValue)
 	assert (pProperty->pValue != 0);
 	strcpy (pProperty->pValue, pValue);
 
-	m_PropArray.Append (pProperty);
+	if (m_pCurrentSection == 0)
+	{
+		m_pCurrentSection = new TSection;
+		assert (m_pCurrentSection != 0);
+
+		m_pCurrentSection->Name = m_CurrentSectionName;
+
+		TPtrListElement *pElement = m_SectionList.GetFirst ();
+		while (pElement != 0)
+		{
+			TPtrListElement *pNext = m_SectionList.GetNext (pElement);
+			if (pNext == 0)
+			{
+				break;
+			}
+
+			pElement = pNext;
+		}
+
+		m_SectionList.InsertAfter (pElement, m_pCurrentSection);
+	}
+
+	m_pCurrentSection->PropArray.Append (pProperty);
 }
 
 boolean CProperties::GetFirst (void)
 {
+	m_pGetSection = m_SectionList.GetFirst ();
 	m_nGetIndex = 0;
 
-	return m_PropArray.GetCount () > m_nGetIndex;
+	if (m_pGetSection == 0)
+	{
+		m_CurrentSectionName = DefaultSection;
+
+		return FALSE;
+	}
+
+	TSection *pSection = (TSection *) m_SectionList.GetPtr (m_pGetSection);
+	assert (pSection != 0);
+
+	m_CurrentSectionName = pSection->Name;
+
+	return pSection->PropArray.GetCount () > m_nGetIndex;
 }
 
 boolean CProperties::GetNext (void)
 {
 	m_nGetIndex++;
 
-	return m_PropArray.GetCount () > m_nGetIndex;
+	assert (m_pGetSection != 0);
+	TSection *pSection = (TSection *) m_SectionList.GetPtr (m_pGetSection);
+	assert (pSection != 0);
+
+	if (pSection->PropArray.GetCount () > m_nGetIndex)
+	{
+		return TRUE;
+	}
+
+	m_pGetSection = m_SectionList.GetNext (m_pGetSection);
+	if (m_pGetSection == 0)
+	{
+		m_CurrentSectionName = DefaultSection;
+		m_pCurrentSection = LookupSection (m_CurrentSectionName);
+
+		return FALSE;
+	}
+
+	pSection = (TSection *) m_SectionList.GetPtr (m_pGetSection);
+	assert (pSection != 0);
+
+	m_CurrentSectionName = pSection->Name;
+	m_pCurrentSection = pSection;
+
+	m_nGetIndex = 0;
+
+	return TRUE;
+}
+
+const char *CProperties::GetSectionName (void) const
+{
+	return m_CurrentSectionName;
 }
 
 const char *CProperties::GetName (void) const
 {
-	assert (m_nGetIndex < m_PropArray.GetCount ());
-	TPropertyPair *pProperty = (TPropertyPair *) m_PropArray[m_nGetIndex];
+	assert (m_pGetSection != 0);
+	TSection *pSection = (TSection *) m_SectionList.GetPtr (m_pGetSection);
+	assert (pSection != 0);
+
+	assert (m_nGetIndex < pSection->PropArray.GetCount ());
+	TPropertyPair *pProperty = (TPropertyPair *) pSection->PropArray[m_nGetIndex];
 	assert (pProperty != 0);
 	assert (pProperty->pName != 0);
 
@@ -281,19 +385,50 @@ const char *CProperties::GetName (void) const
 
 const char *CProperties::GetValue (void) const
 {
-	assert (m_nGetIndex < m_PropArray.GetCount ());
-	TPropertyPair *pProperty = (TPropertyPair *) m_PropArray[m_nGetIndex];
+	assert (m_pGetSection != 0);
+	TSection *pSection = (TSection *) m_SectionList.GetPtr (m_pGetSection);
+	assert (pSection != 0);
+
+	assert (m_nGetIndex < pSection->PropArray.GetCount ());
+	TPropertyPair *pProperty = (TPropertyPair *) pSection->PropArray[m_nGetIndex];
 	assert (pProperty != 0);
 	assert (pProperty->pValue != 0);
 
 	return pProperty->pValue;
 }
 
+TSection *CProperties::LookupSection (const char*pSectionName) const
+{
+	assert (pSectionName != 0);
+
+	TPtrListElement *pElement = m_SectionList.GetFirst ();
+	while (pElement != 0)
+	{
+		TSection *pSection = (TSection *) m_SectionList.GetPtr (pElement);
+		assert (pSection != 0);
+
+		if (pSection->Name.Compare (pSectionName) == 0)
+		{
+			return pSection;
+		}
+
+		pElement = m_SectionList.GetNext (pElement);
+	}
+
+	return 0;
+}
+
+
 TPropertyPair *CProperties::Lookup (const char*pPropertyName) const
 {
-	for (unsigned i = 0; i < m_PropArray.GetCount (); i++)
+	if (m_pCurrentSection == 0)
 	{
-		TPropertyPair *pProperty = (TPropertyPair *) m_PropArray[i];
+		return 0;
+	}
+
+	for (unsigned i = 0; i < m_pCurrentSection->PropArray.GetCount (); i++)
+	{
+		TPropertyPair *pProperty = (TPropertyPair *) m_pCurrentSection->PropArray[i];
 		assert (pProperty != 0);
 		if (strcmp (pProperty->pName, pPropertyName) == 0)
 		{
@@ -308,14 +443,30 @@ TPropertyPair *CProperties::Lookup (const char*pPropertyName) const
 
 void CProperties::Dump (const char *pSource) const
 {
-	CLogger::Get ()->Write (pSource, LogDebug, "Dumping %u properties:", m_PropArray.GetCount ());
+	CLogger::Get ()->Write (pSource, LogDebug, "Dumping properties:");
 
-	for (unsigned i = 0; i < m_PropArray.GetCount (); i++)
+	TPtrListElement *pElement = m_SectionList.GetFirst ();
+	while (pElement != 0)
 	{
-		TPropertyPair *pProperty = (TPropertyPair *) m_PropArray[i];
-		assert (pProperty != 0);
+		TSection *pSection = (TSection *) m_SectionList.GetPtr (pElement);
+		assert (pSection != 0);
+
+		if (pSection->Name.Compare (DefaultSection) != 0)
+		{
+			CLogger::Get ()->Write (pSource, LogDebug, "[%s]",
+						static_cast<const char *> (pSection->Name));
+		}
+
+		for (unsigned i = 0; i < pSection->PropArray.GetCount (); i++)
+		{
+			TPropertyPair *pProperty = (TPropertyPair *) pSection->PropArray[i];
+			assert (pProperty != 0);
+
+			CLogger::Get ()->Write (pSource, LogDebug, "%s=%s",
+						pProperty->pName, pProperty->pValue);
+		}
 
-		CLogger::Get ()->Write (pSource, LogDebug, "%s=%s", pProperty->pName, pProperty->pValue);
+		pElement = m_SectionList.GetNext (pElement);
 	}
 }