Skip to content

raspi: load USB classes from disk #799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bsek wants to merge 2 commits into
base: master
Choose a base branch
from
Open

raspi: load USB classes from disk #799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9ee4ae
raspi: load USB classes from disk
bsek May 15, 2026
f8d1e00
raspi/usbromstartup: keep boot-critical USB classes in ROM
bsek May 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 29 additions & 8 deletions arch/arm-native/soc/broadcom/2708/usb/poseidon/usbromstartup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*
Copyright (C) 1995-2014, The AROS Development Team. All rights reserved.
Copyright (C) 1995-2026, The AROS Development Team. All rights reserved.
*/

/* Very basic bootstrap for Poseidon in AROS kernel for enabling of USB booting and HID devices.
* PsdStackloader should be started during startup-sequence nonetheless */

#define DEBUG 1
#define DEBUG 0

#include <aros/asmcall.h>
#include <aros/debug.h>
Expand All @@ -28,6 +28,28 @@ AROS_UFP3(static IPTR, usbromstartup_init,
AROS_UFHA(BPTR, seglist, A0),
AROS_UFHA(struct ExecBase *, SysBase, A6));

/* Force a resident-list library to be initialised (its lib_init runs and it
* gets added to SysBase->LibList). Needed because AROS's OpenLibrary only
* looks in LibList - it does not trigger InitResident on RTF_AUTOINIT
* residents that haven't been COLDSTART-iterated yet. */
static void prewarm_library(STRPTR name, struct ExecBase *SysBase)
{
if (FindName(&SysBase->LibList, name))
return;
{
struct Resident *res = FindResident(name);
if (res)
{
D(bug("[USBROMStartup] prewarm InitResident(\"%s\")\n", name));
InitResident(res, BNULL);
}
else
{
bug("[USBROMStartup] prewarm: %s not in resident list\n", name);
}
}
}

const struct Resident usbHook =
{
RTC_MATCHWORD,
Expand All @@ -36,7 +58,8 @@ const struct Resident usbHook =
RTF_COLDSTART,
41,
NT_TASK,
35,
/* Run after intuition (residentpri 15) so poseidon.library is initialised. */
10,
name,
&version[5],
(APTR)usbromstartup_init
Expand All @@ -57,6 +80,8 @@ AROS_UFH3(static IPTR, usbromstartup_init,

D(bug("[USBROMStartup] Loading poseidon...\n"));

prewarm_library("poseidon.library", SysBase);

if((ps = OpenLibrary("poseidon.library", 4)))
{
APTR msdclass;
Expand All @@ -66,12 +91,8 @@ AROS_UFH3(static IPTR, usbromstartup_init,
D(bug("[USBROMStartup] Adding classes...\n"));

psdAddClass("hub.class", 0);
if(!(psdAddClass("hid.class", 0)))
{
psdAddClass("bootmouse.class", 0);
psdAddClass("bootkeyboard.class", 0);
}
msdclass = psdAddClass("massstorage.class", 0);
/* hid/bootmouse/bootkeyboard are loaded from disk by AddUSBClasses in Startup-Sequence */

D(bug("[USBROMStartup] Added chipset drivers...\n"));

Expand Down
2 changes: 1 addition & 1 deletion arch/arm-raspi/boot/mmakefile.src
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ PKG_DEVS := input gameport keyboard console sdcard USBHardware/usb2otg
PKG_DEVS_ARCH := timer
PKG_HANDLERS := con ram cdrom sfs fat afs
PKG_HIDDS := hiddclass inputclass gfx keyboard mouse i2c i2c-bcm2708 vc4gfx
PKG_CLASSES := USB/hid USB/hub USB/bootmouse USB/bootkeyboard USB/massstorage
PKG_CLASSES := USB/hub USB/massstorage

%make_package mmake=kernel-package-raspi-arm file=$(AROSDIR)/$(ARM_BSP) \
libs=$(PKG_LIBS) arch_libs=$(PKG_LIBS_ARCH) res=$(PKG_RSRC) \
Expand Down