Dropped support for CSUD library, superseded by USPi

Author: maccasoft

Makefile

@@ -1,7 +1,6 @@
 
 all:
 	make -C kernel
-	make -C csud -k driver CONFIG=FINAL TYPE=STANDALONE TARGET=RPI GNU=arm-none-eabi-
 	make -C uspi
 	make -C zlib
 	make -C libpng
@@ -16,7 +15,6 @@ all:
 
 clean:
 	make -C kernel -k clean
-	make -C csud -k clean
 	make -C uspi -k clean
 	make -C zlib -k clean
 	make -C libpng -k clean

README

@@ -5,7 +5,6 @@ ports.
 
    kernel     - Core startup and kernel code
 
-   csud       - Chadder's Simple USB Driver
    uspi       - An USB driver for Raspberry Pi written in C
    libpng     - PNG image file format library
    libogg     - OGG file format library
@@ -44,8 +43,3 @@ INSTALL
 
    Firmware files can be downloaded from
    https://github.com/raspberrypi/firmware/tree/master/boot
-
-   Please note that the csud library has a bug that crashes the application
-   when used with firmware files release after october 2012. The code,
-   without csud support, was tested using firmware files dated july 5, 2013,
-   any later firmware may not work correctly.

SDL2/.cproject

@@ -52,7 +52,6 @@
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings">
-				<externalSettings containerId="csud;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
 				<externalSettings containerId="uspi;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
 			</storageModule>
 		</cconfiguration>

SDL2/.project

@@ -3,7 +3,6 @@
 	<name>SDL2</name>
 	<comment></comment>
 	<projects>
-		<project>csud</project>
 		<project>uspi</project>
 	</projects>
 	<buildSpec>

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../csud/include -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__
 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
 
-/* #undef HAVE_CSUD */
 #define HAVE_USPI
 #define HAVE_NES
 

SDL2/src/video/raspberry/SDL_rpievents.c

@@ -30,96 +30,10 @@
 #include "SDL_rpivideo.h"
 #include "SDL_rpievents_c.h"
 
-#ifdef HAVE_CSUD
-#include "usbd/usbd.h"
-#include "device/hid/keyboard.h"
-
-#define MAX_KEYS        6
-
-static int keydown[MAX_KEYS] = { 0, 0, 0, 0, 0, 0 };
-static struct KeyboardModifiers modifiers;
-static struct KeyboardModifiers old_modifiers;
-#endif // HAVE_CSUD
-
 void
 RASPBERRY_PumpEvents(_THIS)
 {
-#ifdef HAVE_CSUD
-    u32 kbdCount = KeyboardCount();
-    if (kbdCount == 0) {
-        for (int i = 0; i < MAX_KEYS; i++) {
-            keydown[i] = 0;
-        }
-        return;
-    }
-
-    u32 kbdAddress = KeyboardGetAddress(0);
-    if (kbdAddress == 0) {
-        for (int i = 0; i < MAX_KEYS; i++) {
-            keydown[i] = 0;
-        }
-        return;
-    }
-
-    KeyboardPoll(kbdAddress);
-
-    modifiers = KeyboardGetModifiers(kbdAddress);
-    if (modifiers.LeftShift != old_modifiers.LeftShift) {
-        SDL_SendKeyboardKey(modifiers.LeftShift ? SDL_PRESSED : SDL_RELEASED, SDL_SCANCODE_LSHIFT);
-    }
-    if (modifiers.RightShift != old_modifiers.RightShift) {
-        SDL_SendKeyboardKey(modifiers.RightShift ? SDL_PRESSED : SDL_RELEASED, SDL_SCANCODE_RSHIFT);
-    }
-    if (modifiers.LeftAlt != old_modifiers.LeftAlt) {
-        SDL_SendKeyboardKey(modifiers.LeftAlt ? SDL_PRESSED : SDL_RELEASED, SDL_SCANCODE_LALT);
-    }
-    if (modifiers.RightAlt != old_modifiers.RightAlt) {
-        SDL_SendKeyboardKey(modifiers.RightAlt ? SDL_PRESSED : SDL_RELEASED, SDL_SCANCODE_RALT);
-    }
-    if (modifiers.LeftControl != old_modifiers.LeftControl) {
-        SDL_SendKeyboardKey(modifiers.LeftControl ? SDL_PRESSED : SDL_RELEASED, SDL_SCANCODE_LCTRL);
-    }
-    if (modifiers.RightControl != old_modifiers.RightControl) {
-        SDL_SendKeyboardKey(modifiers.RightControl ? SDL_PRESSED : SDL_RELEASED, SDL_SCANCODE_RCTRL);
-    }
-    if (modifiers.LeftGui != old_modifiers.LeftGui) {
-        SDL_SendKeyboardKey(modifiers.LeftGui ? SDL_PRESSED : SDL_RELEASED, SDL_SCANCODE_LGUI);
-    }
-    if (modifiers.RightGui != old_modifiers.RightGui) {
-        SDL_SendKeyboardKey(modifiers.RightGui ? SDL_PRESSED : SDL_RELEASED, SDL_SCANCODE_RGUI);
-    }
-    old_modifiers = modifiers;
-
-    int keydownCount = KeyboardGetKeyDownCount(kbdAddress);
-    for (int index = 0; index < keydownCount; index++) {
-        u16 key = KeyboardGetKeyDown(kbdAddress, index);
-        for (int i = 0; i < MAX_KEYS; i++) {
-            if (key == keydown[i]) {
-                key = 0;
-                break;
-            }
-        }
-        if (key != 0) {
-            for (int i = 0; i < MAX_KEYS; i++) {
-                if (keydown[i] == 0) {
-                    SDL_SendKeyboardKey(SDL_PRESSED, key);
-                    keydown[i] = key;
-                    break;
-                }
-            }
-        }
-    }
 
-    for (int index = 0; index < MAX_KEYS; index++) {
-        u16 key = keydown[index];
-        if (key != 0) {
-            if (!KeyboadGetKeyIsDown(kbdAddress, key)) {
-                SDL_SendKeyboardKey(SDL_RELEASED, key);
-                keydown[index] = 0;
-            }
-        }
-    }
-#endif // HAVE_CSUD
 }
 
 #endif /* SDL_VIDEO_DRIVER_RASPBERRY */

SDL2/src/video/raspberry/SDL_rpivideo.c

@@ -39,11 +39,6 @@
 
 #include "../../core/raspberry/SDL_raspberry.h"
 
-#ifdef HAVE_CSUD
-#include "usbd/usbd.h"
-#include "device/hid/keyboard.h"
-#endif // HAVE_CSUD
-
 #ifdef HAVE_USPI
 #include "uspi.h"
 
@@ -205,10 +200,6 @@ RASPBERRY_CreateDevice(int devindex)
 
     device->free = RASPBERRY_DeleteDevice;
 
-#ifdef HAVE_CSUD
-    UsbInitialise();
-#endif // HAVE_CSUD
-
 #ifdef HAVE_USPI
     USPiInitialize ();
     if (USPiKeyboardAvailable()) {

abbaye/.cproject

@@ -57,7 +57,6 @@
 				<externalSettings containerId="SDL2;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
 				<externalSettings containerId="SDL2_mixer;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
 				<externalSettings containerId="SDL2_image;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
-				<externalSettings containerId="csud;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
 				<externalSettings containerId="uspi;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
 			</storageModule>
 		</cconfiguration>

abbaye/.project

@@ -7,7 +7,6 @@
 		<project>SDL2_mixer</project>
 		<project>SDL2_image</project>
 		<project>kernel</project>
-		<project>csud</project>
 		<project>uspi</project>
 	</projects>
 	<buildSpec>

abbaye/Makefile

@@ -6,7 +6,6 @@ include ../kernel/common.mk
 include ../SDL2_image/pkgconfig.mk
 include ../SDL2_mixer/pkgconfig.mk
 include ../SDL2/pkgconfig.mk
-#include ../csud/pkgconfig.mk
 include ../uspi/pkgconfig.mk
 include ../libvorbis/pkgconfig.mk
 include ../libpng/pkgconfig.mk