Updated kernel API

Added variable arguments console print functions
Added generic usb and keyboard initialization functions
Keyboard mappings moved to kernel
Log functions moved to kernel

Author: maccasoft

SDL2/Makefile

@@ -11,7 +11,7 @@ OBJCOPY := $(TOOLCHAIN)-objcopy
 DEPDIR := .deps
 
 ASFLAGS = --warn -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp
-CFLAGS = -O3 -Iinclude -Isrc -I../uspi/include -ffreestanding -fvisibility=hidden -marm -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp -D_REENTRANT -D__RASPBERRY_PI__
+CFLAGS = -O3 -Iinclude -Isrc -I../uspi/include -ffreestanding -fvisibility=hidden -marm -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp -D_REENTRANT -D__RASPBERRY_PI__ -DHAVE_USPI
 CPPFLAGS = $(CFLAGS) -fno-exceptions -fno-unwind-tables -fno-rtti
 
 all: libSDL2.a

SDL2/include/SDL_config_raspberry.h

@@ -146,7 +146,6 @@
 #define HAVE_GCC_SYNC_LOCK_TEST_AND_SET 1
 #endif
 
-#define HAVE_USPI
 #define HAVE_NES
 
 /* SDL internal assertion support */

SDL2/src/core/raspberry/SDL_raspberry.c

@@ -179,25 +179,6 @@ void Raspberry_digitalWrite(int pin, int value) {
     }
 }
 
-#ifdef HAVE_USPI
-
-void LogWrite (const char *pSource, unsigned Severity, const char *pMessage, ...)
-{
-    // Do nothing
-}
-
-void uspi_assertion_failed (const char *pExpr, const char *pFile, unsigned nLine)
-{
-    while(1);
-}
-
-void DebugHexdump (const void *pBuffer, unsigned nBufLen, const char *pSource /* = 0 */)
-{
-    // Do nothing
-}
-
-#endif // HAVE_USPI
-
 void SDL_Interrupt_Handler() {
     if ((IRQ->irq1Pending & INTERRUPT_DMA0) != 0)
         RASPBERRYAUD_DmaInterruptHandler();
@@ -206,8 +187,3 @@ void SDL_Interrupt_Handler() {
         USPiInterruptHandler ();
 #endif
 }
-
-void log_printf (const char *ptr, ...)
-{
-    // Do nothing
-}

kernel/.cproject

@@ -14,14 +14,20 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildProperties="" id="cdt.managedbuild.toolchain.gnu.cross.base.299000108" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.cross.base.299000108" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
 					<folderInfo id="cdt.managedbuild.toolchain.gnu.cross.base.299000108.1748345975" name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.cross.base.1355025596" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.base">
 							<option id="cdt.managedbuild.option.gnu.cross.prefix.1520318216" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix"/>
 							<option id="cdt.managedbuild.option.gnu.cross.path.470053298" name="Path" superClass="cdt.managedbuild.option.gnu.cross.path"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.cross.1030335959" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/>
-							<builder id="cdt.managedbuild.builder.gnu.cross.1500447050" managedBuildOn="false" name="Gnu Make Builder.Default" superClass="cdt.managedbuild.builder.gnu.cross"/>
+							<builder id="cdt.managedbuild.builder.gnu.cross.1500447050" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.builder.gnu.cross"/>
 							<tool id="cdt.managedbuild.tool.gnu.cross.c.compiler.1465669417" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
+								<option id="gnu.c.compiler.option.preprocessor.def.symbols.1958204956" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="HAVE_USPI"/>
+								</option>
+								<option id="gnu.c.compiler.option.include.paths.461836132" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/uspi/include}&quot;"/>
+								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.460505247" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.2044554671" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler"/>
@@ -46,10 +52,13 @@
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 		<project id="kernel.null.1901389621" name="kernel"/>
 	</storageModule>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="refreshScope"/>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.299000108;cdt.managedbuild.toolchain.gnu.cross.base.299000108.1748345975;cdt.managedbuild.tool.gnu.cross.c.compiler.1465669417;cdt.managedbuild.tool.gnu.c.compiler.input.460505247">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
 </cproject>

kernel/Makefile

@@ -8,7 +8,8 @@ OBJS = \
 	fb.o \
 	ff.o \
 	platform.o \
-	wiring.o
+	usb.o \
+	wiring.o \
 
 -include common.mk
 -include $(DEPDIR)/*.Po
@@ -17,5 +18,5 @@ libkernel.a: $(OBJS) start.o syscalls.o Makefile raspberry.ld
 	$(AR) rcs -o $@ $(OBJS)
 
 clean:
-	rm -f *.o libkernel.a
+	rm -f $(OBJS) libkernel.a
 	rm -rf $(DEPDIR)

kernel/common.mk

@@ -11,7 +11,7 @@ OBJCOPY := $(TOOLCHAIN)-objcopy
 DEPDIR := .deps
 
 ASFLAGS = --warn -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp
-CFLAGS = -Wall -O2 -ffreestanding -marm -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp -fsigned-char -D__RASPBERRY_PI__ -I../kernel -I../uspi/include
+CFLAGS = -Wall -O2 -ffreestanding -marm -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp -fsigned-char -D__RASPBERRY_PI__ -DHAVE_USPI -I../kernel -I../uspi/include
 CPPFLAGS = $(CFLAGS) -fno-exceptions -fno-unwind-tables -fno-rtti
 LDFLAGS = -T ../kernel/raspberry.ld -nostartfiles -fno-exceptions -fno-unwind-tables -fno-rtti -Wl,-Map=kernel.map -o kernel.elf
 

kernel/console.c

@@ -15,6 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdio.h>
+#include <stdarg.h>
 #include <string.h>
 
 #include "console.h"
@@ -343,6 +345,7 @@ int mvaddch(int y, int x, int c) {
 
 void refresh() {
     // Do nothing, updates are immediate
+    fb_flip();
 }
 
 void toggle_cursor() {
@@ -387,3 +390,25 @@ void hide_cursor() {
         cursor_visible = 0;
     }
 }
+
+int addstrf(const char *ptr, ...) {
+    va_list var;
+    char buffer[256];
+
+    va_start (var, ptr);
+    vsnprintf (buffer, sizeof(buffer) - 1, ptr, var);
+    va_end (var);
+
+    return addstr(buffer);
+}
+
+int mvaddstrf(int y, int x, const char *ptr, ...) {
+    va_list var;
+    char buffer[256];
+
+    va_start (var, ptr);
+    vsnprintf (buffer, sizeof(buffer) - 1, ptr, var);
+    va_end (var);
+
+    return mvaddstr(y, x, buffer);
+}

kernel/console.h

@@ -20,6 +20,32 @@
 
 #include "fb.h"
 
+#define KEY_ESC     0x2900
+
+#define KEY_F1      0x3A00
+#define KEY_F2      0x3B00
+#define KEY_F3      0x3C00
+#define KEY_F4      0x3D00
+#define KEY_F5      0x3E00
+#define KEY_F6      0x3F00
+#define KEY_F7      0x4000
+#define KEY_F8      0x4100
+#define KEY_F9      0x4200
+#define KEY_F10     0x4300
+#define KEY_F11     0x4400
+#define KEY_F12     0x4500
+
+#define KEY_CANC    0x4C00
+#define KEY_INS     0x4900
+#define KEY_PGDN    0x4E00
+#define KEY_PGUP    0x4B00
+#define KEY_END     0x4D00
+#define KEY_HOME    0x4A00
+#define KEY_RIGHT   0x4F00
+#define KEY_LEFT    0x5000
+#define KEY_DOWN    0x5100
+#define KEY_UP      0x5200
+
 extern int con_width;
 extern int con_height;
 extern int txt_width;
@@ -43,6 +69,11 @@ int addstr(const char *s);
 int mvaddch(int y, int x, int c);
 int mvaddstr(int y, int x, const char *s);
 
+int addstrf(const char *ptr, ...);
+int mvaddstrf(int y, int x, const char *ptr, ...);
+
+int getch();
+
 void refresh();
 
 #define getyx(y,x)  y = cur_y; x = cur_x

kernel/kernel.h

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2014 Marco Maccaferri and Others
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef KERNEL_H_
+#define KERNEL_H_
+
+#include "fb.h"
+#include "console.h"
+#include "audio.h"
+#include "emmc.h"
+#include "ff.h"
+
+#ifdef HAVE_USPI
+#include "uspi.h"
+#endif
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+int usb_init();
+
+int keyboard_init();
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* KERNEL_H_ */

kernel/syscalls.c

@@ -25,7 +25,10 @@
 
 #include "emmc.h"
 #include "ff.h"
+
+#ifdef HAVE_USPI
 #include "uspi.h"
+#endif
 
 extern struct emmc_block_dev emmc_dev;
 
@@ -306,12 +309,14 @@ DSTATUS disk_status (
         case MMC :
             return 0;
 
+#ifdef HAVE_USPI
         default :
             if (!USPiMassStorageDeviceAvailable())
             {
                 return STA_NOINIT;
             }
             return 0;
+#endif
     }
     return STA_NOINIT;
 }
@@ -330,12 +335,14 @@ DSTATUS disk_initialize (
         case MMC :
             return 0;
 
+#ifdef HAVE_USPI
         default :
             if (!USPiMassStorageDeviceAvailable())
             {
                 return STA_NOINIT;
             }
             return 0;
+#endif
     }
     return STA_NOINIT;
 }
@@ -365,6 +372,7 @@ DRESULT disk_read (
             return RES_OK;
         }
 
+#ifdef HAVE_USPI
         default :
         {
             if (!USPiMassStorageDeviceAvailable())
@@ -380,6 +388,7 @@ DRESULT disk_read (
 
             return RES_OK;
         }
+#endif
     }
 
     return RES_PARERR;
@@ -410,6 +419,7 @@ DRESULT disk_write (
             return RES_OK;
         }
 
+#ifdef HAVE_USPI
         default :
         {
             if (!USPiMassStorageDeviceAvailable())
@@ -425,6 +435,7 @@ DRESULT disk_write (
 
             return RES_OK;
         }
+#endif
     }
 
     return RES_PARERR;
@@ -464,6 +475,7 @@ DRESULT disk_ioctl (
             }
             return RES_PARERR;
 
+#ifdef HAVE_USPI
         default :
             if (!USPiMassStorageDeviceAvailable())
             {
@@ -489,6 +501,7 @@ DRESULT disk_ioctl (
                 return RES_OK;
             }
             return RES_PARERR;
+#endif
     }
 
     return RES_PARERR;
@@ -508,3 +521,23 @@ DWORD get_fattime (void)
             | ((DWORD)ltm->tm_sec >> 1);
 }
 #endif
+
+void LogWrite (const char *pSource, unsigned Severity, const char *pMessage, ...)
+{
+    // Do nothing
+}
+
+void uspi_assertion_failed (const char *pExpr, const char *pFile, unsigned nLine)
+{
+    // Do nothing
+}
+
+void DebugHexdump (const void *pBuffer, unsigned nBufLen, const char *pSource /* = 0 */)
+{
+    // Do nothing
+}
+
+void log_printf (const char *ptr, ...)
+{
+    // Do nothing
+}