Skip to content

Commit bc6bbf9

Browse files
committed
Dropped support for CSUD library, superseded by USPi
1 parent 32eda57 commit bc6bbf9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+4
-8188
lines changed

Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11

22
all:
33
make -C kernel
4-
make -C csud -k driver CONFIG=FINAL TYPE=STANDALONE TARGET=RPI GNU=arm-none-eabi-
54
make -C uspi
65
make -C zlib
76
make -C libpng
@@ -16,7 +15,6 @@ all:
1615

1716
clean:
1817
make -C kernel -k clean
19-
make -C csud -k clean
2018
make -C uspi -k clean
2119
make -C zlib -k clean
2220
make -C libpng -k clean

README

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ ports.
55

66
kernel - Core startup and kernel code
77

8-
csud - Chadder's Simple USB Driver
98
uspi - An USB driver for Raspberry Pi written in C
109
libpng - PNG image file format library
1110
libogg - OGG file format library
@@ -44,8 +43,3 @@ INSTALL
4443

4544
Firmware files can be downloaded from
4645
https://github.com/raspberrypi/firmware/tree/master/boot
47-
48-
Please note that the csud library has a bug that crashes the application
49-
when used with firmware files release after october 2012. The code,
50-
without csud support, was tested using firmware files dated july 5, 2013,
51-
any later firmware may not work correctly.

SDL2/.cproject

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
</configuration>
5353
</storageModule>
5454
<storageModule moduleId="org.eclipse.cdt.core.externalSettings">
55-
<externalSettings containerId="csud;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
5655
<externalSettings containerId="uspi;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
5756
</storageModule>
5857
</cconfiguration>

SDL2/.project

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<name>SDL2</name>
44
<comment></comment>
55
<projects>
6-
<project>csud</project>
76
<project>uspi</project>
87
</projects>
98
<buildSpec>

SDL2/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ OBJCOPY := $(TOOLCHAIN)-objcopy
1111
DEPDIR := .deps
1212

1313
ASFLAGS = --warn -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp
14-
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__
14+
CFLAGS = -O3 -Iinclude -Isrc -I../uspi/include -ffreestanding -fvisibility=hidden -marm -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp -D_REENTRANT -D__RASPBERRY_PI__
1515
CPPFLAGS = $(CFLAGS) -fno-exceptions -fno-unwind-tables -fno-rtti
1616

1717
all: libSDL2.a

SDL2/include/SDL_config_raspberry.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@
146146
#define HAVE_GCC_SYNC_LOCK_TEST_AND_SET 1
147147
#endif
148148

149-
/* #undef HAVE_CSUD */
150149
#define HAVE_USPI
151150
#define HAVE_NES
152151

SDL2/src/video/raspberry/SDL_rpievents.c

Lines changed: 0 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -30,96 +30,10 @@
3030
#include "SDL_rpivideo.h"
3131
#include "SDL_rpievents_c.h"
3232

33-
#ifdef HAVE_CSUD
34-
#include "usbd/usbd.h"
35-
#include "device/hid/keyboard.h"
36-
37-
#define MAX_KEYS 6
38-
39-
static int keydown[MAX_KEYS] = { 0, 0, 0, 0, 0, 0 };
40-
static struct KeyboardModifiers modifiers;
41-
static struct KeyboardModifiers old_modifiers;
42-
#endif // HAVE_CSUD
43-
4433
void
4534
RASPBERRY_PumpEvents(_THIS)
4635
{
47-
#ifdef HAVE_CSUD
48-
u32 kbdCount = KeyboardCount();
49-
if (kbdCount == 0) {
50-
for (int i = 0; i < MAX_KEYS; i++) {
51-
keydown[i] = 0;
52-
}
53-
return;
54-
}
55-
56-
u32 kbdAddress = KeyboardGetAddress(0);
57-
if (kbdAddress == 0) {
58-
for (int i = 0; i < MAX_KEYS; i++) {
59-
keydown[i] = 0;
60-
}
61-
return;
62-
}
63-
64-
KeyboardPoll(kbdAddress);
65-
66-
modifiers = KeyboardGetModifiers(kbdAddress);
67-
if (modifiers.LeftShift != old_modifiers.LeftShift) {
68-
SDL_SendKeyboardKey(modifiers.LeftShift ? SDL_PRESSED : SDL_RELEASED, SDL_SCANCODE_LSHIFT);
69-
}
70-
if (modifiers.RightShift != old_modifiers.RightShift) {
71-
SDL_SendKeyboardKey(modifiers.RightShift ? SDL_PRESSED : SDL_RELEASED, SDL_SCANCODE_RSHIFT);
72-
}
73-
if (modifiers.LeftAlt != old_modifiers.LeftAlt) {
74-
SDL_SendKeyboardKey(modifiers.LeftAlt ? SDL_PRESSED : SDL_RELEASED, SDL_SCANCODE_LALT);
75-
}
76-
if (modifiers.RightAlt != old_modifiers.RightAlt) {
77-
SDL_SendKeyboardKey(modifiers.RightAlt ? SDL_PRESSED : SDL_RELEASED, SDL_SCANCODE_RALT);
78-
}
79-
if (modifiers.LeftControl != old_modifiers.LeftControl) {
80-
SDL_SendKeyboardKey(modifiers.LeftControl ? SDL_PRESSED : SDL_RELEASED, SDL_SCANCODE_LCTRL);
81-
}
82-
if (modifiers.RightControl != old_modifiers.RightControl) {
83-
SDL_SendKeyboardKey(modifiers.RightControl ? SDL_PRESSED : SDL_RELEASED, SDL_SCANCODE_RCTRL);
84-
}
85-
if (modifiers.LeftGui != old_modifiers.LeftGui) {
86-
SDL_SendKeyboardKey(modifiers.LeftGui ? SDL_PRESSED : SDL_RELEASED, SDL_SCANCODE_LGUI);
87-
}
88-
if (modifiers.RightGui != old_modifiers.RightGui) {
89-
SDL_SendKeyboardKey(modifiers.RightGui ? SDL_PRESSED : SDL_RELEASED, SDL_SCANCODE_RGUI);
90-
}
91-
old_modifiers = modifiers;
92-
93-
int keydownCount = KeyboardGetKeyDownCount(kbdAddress);
94-
for (int index = 0; index < keydownCount; index++) {
95-
u16 key = KeyboardGetKeyDown(kbdAddress, index);
96-
for (int i = 0; i < MAX_KEYS; i++) {
97-
if (key == keydown[i]) {
98-
key = 0;
99-
break;
100-
}
101-
}
102-
if (key != 0) {
103-
for (int i = 0; i < MAX_KEYS; i++) {
104-
if (keydown[i] == 0) {
105-
SDL_SendKeyboardKey(SDL_PRESSED, key);
106-
keydown[i] = key;
107-
break;
108-
}
109-
}
110-
}
111-
}
11236

113-
for (int index = 0; index < MAX_KEYS; index++) {
114-
u16 key = keydown[index];
115-
if (key != 0) {
116-
if (!KeyboadGetKeyIsDown(kbdAddress, key)) {
117-
SDL_SendKeyboardKey(SDL_RELEASED, key);
118-
keydown[index] = 0;
119-
}
120-
}
121-
}
122-
#endif // HAVE_CSUD
12337
}
12438

12539
#endif /* SDL_VIDEO_DRIVER_RASPBERRY */

SDL2/src/video/raspberry/SDL_rpivideo.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,6 @@
3939

4040
#include "../../core/raspberry/SDL_raspberry.h"
4141

42-
#ifdef HAVE_CSUD
43-
#include "usbd/usbd.h"
44-
#include "device/hid/keyboard.h"
45-
#endif // HAVE_CSUD
46-
4742
#ifdef HAVE_USPI
4843
#include "uspi.h"
4944

@@ -205,10 +200,6 @@ RASPBERRY_CreateDevice(int devindex)
205200

206201
device->free = RASPBERRY_DeleteDevice;
207202

208-
#ifdef HAVE_CSUD
209-
UsbInitialise();
210-
#endif // HAVE_CSUD
211-
212203
#ifdef HAVE_USPI
213204
USPiInitialize ();
214205
if (USPiKeyboardAvailable()) {

abbaye/.cproject

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
<externalSettings containerId="SDL2;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
5858
<externalSettings containerId="SDL2_mixer;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
5959
<externalSettings containerId="SDL2_image;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
60-
<externalSettings containerId="csud;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
6160
<externalSettings containerId="uspi;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
6261
</storageModule>
6362
</cconfiguration>

abbaye/.project

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<project>SDL2_mixer</project>
88
<project>SDL2_image</project>
99
<project>kernel</project>
10-
<project>csud</project>
1110
<project>uspi</project>
1211
</projects>
1312
<buildSpec>

abbaye/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ include ../kernel/common.mk
66
include ../SDL2_image/pkgconfig.mk
77
include ../SDL2_mixer/pkgconfig.mk
88
include ../SDL2/pkgconfig.mk
9-
#include ../csud/pkgconfig.mk
109
include ../uspi/pkgconfig.mk
1110
include ../libvorbis/pkgconfig.mk
1211
include ../libpng/pkgconfig.mk

csud/.cproject

Lines changed: 0 additions & 66 deletions
This file was deleted.

csud/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

csud/.project

Lines changed: 0 additions & 26 deletions
This file was deleted.

csud/.settings/language.settings.xml

Lines changed: 0 additions & 15 deletions
This file was deleted.

csud/LICENSE

Lines changed: 0 additions & 22 deletions
This file was deleted.

csud/arguments

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)