Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d3c164e8af | ||
|
|
5e9d0004d7 |
No files matched your search
@@ -14,7 +14,5 @@ localenv.json
|
|||||||
/lvgl/
|
/lvgl/
|
||||||
dockerout.txt
|
dockerout.txt
|
||||||
AGENTS.md
|
AGENTS.md
|
||||||
lessons_learnt.md
|
|
||||||
*.log
|
*.log
|
||||||
/doc/*.md
|
/doc/*.md
|
||||||
wasuro
|
|
||||||
@@ -24,7 +24,6 @@ declare -a run_steps=(
|
|||||||
"compile_stub.sh" "Failed to compile stub!"
|
"compile_stub.sh" "Failed to compile stub!"
|
||||||
"compile_vergen.sh" "Versions failed to compile"
|
"compile_vergen.sh" "Versions failed to compile"
|
||||||
"compile_lvgl.sh" "Failed to compile LVGL!"
|
"compile_lvgl.sh" "Failed to compile LVGL!"
|
||||||
"compile_wasuro.sh" "Failed to pull Wasuro!"
|
|
||||||
"compile_sources.sh" "Failed to compile FPC Sources!"
|
"compile_sources.sh" "Failed to compile FPC Sources!"
|
||||||
"compile_link.sh" "Failed linking!"
|
"compile_link.sh" "Failed linking!"
|
||||||
"compile_isogen.sh" "Failed to create ISO!"
|
"compile_isogen.sh" "Failed to create ISO!"
|
||||||
|
|||||||
+7
-21
@@ -1,7 +1,7 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# compile_lvgl.sh — Download LVGL v9.2 source and compile into lib/liblvgl.a
|
# compile_lvgl.sh — Download LVGL v9.2 source and compile into lib/liblvgl.a
|
||||||
# Clone & compile in /tmp (fast container-local fs).
|
# Clone & compile in /tmp (fast container-local fs).
|
||||||
# Cache liblvgl.a on host mount (/code/lvgl/) to skip rebuild.
|
# Copy source + objects to /lvgl (host mount) for debugging.
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
LVGL_VERSION="v9.2.2"
|
LVGL_VERSION="v9.2.2"
|
||||||
@@ -10,7 +10,6 @@ LVGL_DIR="/tmp/lvgl"
|
|||||||
OBJ_DIR="/tmp/lvgl_obj"
|
OBJ_DIR="/tmp/lvgl_obj"
|
||||||
CONF_DIR="$(pwd)/lvglh"
|
CONF_DIR="$(pwd)/lvglh"
|
||||||
OUT_DIR="$(pwd)/lib"
|
OUT_DIR="$(pwd)/lib"
|
||||||
CACHE_DIR="/code/lvgl"
|
|
||||||
|
|
||||||
CC="gcc"
|
CC="gcc"
|
||||||
CFLAGS="-m32 -march=i686 -ffreestanding \
|
CFLAGS="-m32 -march=i686 -ffreestanding \
|
||||||
@@ -27,17 +26,6 @@ echo " "
|
|||||||
echo "Compiling LVGL..."
|
echo "Compiling LVGL..."
|
||||||
echo " "
|
echo " "
|
||||||
|
|
||||||
# If cached liblvgl.a exists on host mount, just copy it and skip everything
|
|
||||||
if [ -f "${CACHE_DIR}/liblvgl.a" ]; then
|
|
||||||
echo "Found cached liblvgl.a in ${CACHE_DIR}, copying to ${OUT_DIR}..."
|
|
||||||
cp "${CACHE_DIR}/liblvgl.a" "${OUT_DIR}/liblvgl.a"
|
|
||||||
echo "(Delete lvgl/liblvgl.a to force a full rebuild.)"
|
|
||||||
echo " "
|
|
||||||
echo "LVGL compilation complete (cached)."
|
|
||||||
echo " "
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Clone LVGL into /tmp (container-local)
|
# Clone LVGL into /tmp (container-local)
|
||||||
rm -rf "$LVGL_DIR"
|
rm -rf "$LVGL_DIR"
|
||||||
echo "Downloading LVGL ${LVGL_VERSION}..."
|
echo "Downloading LVGL ${LVGL_VERSION}..."
|
||||||
@@ -117,14 +105,12 @@ else
|
|||||||
echo "No custom LVGL files in lvglh/."
|
echo "No custom LVGL files in lvglh/."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Cache liblvgl.a and source to host mount for next build
|
# Copy source + objects to /lvgl host mount for debugging
|
||||||
echo "Caching LVGL to host mount..."
|
echo "Copying LVGL source and objects to host mount..."
|
||||||
mkdir -p "$CACHE_DIR"
|
mkdir /code/lvgl 2>/dev/null || true
|
||||||
rm -rf ${CACHE_DIR}/* ${CACHE_DIR}/.[!.]* ${CACHE_DIR}/..?* 2>/dev/null || true
|
rm -rf /code/lvgl/* /code/lvgl/.[!.]* /code/lvgl/..?* 2>/dev/null || true
|
||||||
cp "${OUT_DIR}/liblvgl.a" "${CACHE_DIR}/liblvgl.a"
|
cp -a "$LVGL_DIR/src" /code/lvgl/src
|
||||||
cp -a "$LVGL_DIR/src" "${CACHE_DIR}/src"
|
cp -a "$OBJ_DIR" /code/lvgl/obj
|
||||||
cp -a "$LVGL_DIR"/*.h "${CACHE_DIR}/" 2>/dev/null || true
|
|
||||||
cp -a "$OBJ_DIR" "${CACHE_DIR}/obj"
|
|
||||||
echo "Done."
|
echo "Done."
|
||||||
|
|
||||||
echo " "
|
echo " "
|
||||||
|
|||||||
+1
-7
@@ -4,10 +4,4 @@ echo "======================="
|
|||||||
echo " "
|
echo " "
|
||||||
echo "Compiling FPC Sources..."
|
echo "Compiling FPC Sources..."
|
||||||
echo " "
|
echo " "
|
||||||
# Build -Fu flags for all directories under src/ and wasuro/
|
fpc -Aelf -gw -g -gl -n -v0ew -O3 -OpPENTIUM3 -Si -Sc -Sg -Xd -CX -XXs -CfSSE -CfSSE2 -Rintel -Pi386 -Tlinux -FElib/ -Fusrc/* -Fusrc/driver/* -Fusrc/driver/net/* -Fusrc/driver/bus/* -Fusrc/driver/bus/usb/* -Fusrc/driver/hid/* src/kernel.pas
|
||||||
FU_PATHS="-Fusrc -Fuwasuro"
|
|
||||||
for dir in $(find src wasuro -type d 2>/dev/null); do
|
|
||||||
FU_PATHS="$FU_PATHS -Fu$dir"
|
|
||||||
done
|
|
||||||
|
|
||||||
fpc -Aelf -gw -g -gl -n -v0e -O3 -OpPENTIUM3 -Si -Sc -Sg -Xd -CX -XXs -CfSSE -CfSSE2 -Rintel -Pi386 -Tlinux -FElib/ $FU_PATHS src/kernel.pas
|
|
||||||
@@ -5,4 +5,3 @@ echo " "
|
|||||||
echo "Compiling Stub..."
|
echo "Compiling Stub..."
|
||||||
echo " "
|
echo " "
|
||||||
nasm -f elf src/stub/stub.asm -o lib/stub.o
|
nasm -f elf src/stub/stub.asm -o lib/stub.o
|
||||||
nasm -f elf src/stub/splash_tga.asm -o lib/splash_tga.o
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
# compile_wasuro.sh — Pull Wasuro WASM runtime source into wasuro/
|
|
||||||
# Clones the repo (sparse, src/wasm only) and copies the Pascal sources
|
|
||||||
# into $PWD/wasuro so the FPC build can reference them via -Fu.
|
|
||||||
set -e
|
|
||||||
|
|
||||||
WASURO_REPO="https://gitea.spexeah.com/Spexeah/Wasuro.git"
|
|
||||||
WASURO_BRANCH="develop"
|
|
||||||
WASURO_TMP="/tmp/wasuro"
|
|
||||||
WASURO_OUT="$(pwd)/wasuro"
|
|
||||||
|
|
||||||
echo " "
|
|
||||||
echo "======================="
|
|
||||||
echo " "
|
|
||||||
echo "Pulling Wasuro WASM runtime..."
|
|
||||||
echo " "
|
|
||||||
|
|
||||||
# Skip if wasuro/ already has .pas files (cached from previous build)
|
|
||||||
if [ -n "$(find "${WASURO_OUT}" -name '*.pas' 2>/dev/null | head -1)" ]; then
|
|
||||||
echo "Wasuro sources already present in ${WASURO_OUT}, skipping pull."
|
|
||||||
echo " "
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Clone sparse checkout (only src/wasm)
|
|
||||||
rm -rf "$WASURO_TMP"
|
|
||||||
git clone --depth 1 --branch "${WASURO_BRANCH}" --filter=blob:none --sparse \
|
|
||||||
"${WASURO_REPO}" "${WASURO_TMP}" 2>&1
|
|
||||||
cd "$WASURO_TMP"
|
|
||||||
git sparse-checkout set src/wasm 2>&1
|
|
||||||
cd -
|
|
||||||
|
|
||||||
echo "Copying src/wasm to ${WASURO_OUT}..."
|
|
||||||
rm -rf "$WASURO_OUT"
|
|
||||||
mkdir -p "$WASURO_OUT"
|
|
||||||
cp -a "${WASURO_TMP}/src/wasm/"* "$WASURO_OUT"/
|
|
||||||
rm -rf "$WASURO_TMP"
|
|
||||||
|
|
||||||
TOTAL=$(find "$WASURO_OUT" -name '*.pas' | wc -l)
|
|
||||||
echo "Copied ${TOTAL} Pascal source files."
|
|
||||||
echo " "
|
|
||||||
echo "Wasuro pull complete."
|
|
||||||
echo " "
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
#Flat filesystem
|
|
||||||
|
|
||||||
A super simple filesystem for asuro. Folders are emulated in filenames.
|
|
||||||
|
|
||||||
Starts with disk info sector, sector 0 of volume
|
|
||||||
|
|
||||||
---
|
|
||||||
#### disk info
|
|
||||||
|
|
||||||
jmp2boot : ubit24;
|
|
||||||
OEMName : array[0..7] of char;
|
|
||||||
version : uint16 // numerical version of filesystem
|
|
||||||
sectorCount : uint16;
|
|
||||||
fileCount : uint16
|
|
||||||
signature : uint32 = 0x0B00B1E5
|
|
||||||
|
|
||||||
|
|
||||||
the Rest of the sector is reserved
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
Starting from sector 1 is the file table. Table size is determined by entry size (64) * fileCount
|
|
||||||
|
|
||||||
---
|
|
||||||
####File entry
|
|
||||||
|
|
||||||
name : array[0..59] of char //file name max 60 chars
|
|
||||||
fileStart : 16bit // start sector of data
|
|
||||||
fileSize : 16bit // data size in sectors
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.0 MiB |
Generated
-1
@@ -1 +0,0 @@
|
|||||||
Hello from the Asuro ISO!
|
|
||||||
+2
-108
@@ -13,120 +13,14 @@
|
|||||||
// limitations under the License.
|
// limitations under the License.
|
||||||
|
|
||||||
{
|
{
|
||||||
ContextSwitcher - Custom IRQ0 handler for preemptive context switching.
|
ContextSwitcher - Switch Process Contexts when preempted.
|
||||||
|
|
||||||
Replaces the default ISR_32 with a naked assembly stub that saves the
|
|
||||||
interrupted context (PUSHAD + segment regs), calls a Pascal helper to
|
|
||||||
dispatch timer hooks, send EOI, and run the scheduler, then restores
|
|
||||||
the next process context (or idles) via the returned ESP.
|
|
||||||
|
|
||||||
@author(Kieron Morris <[email protected]>)
|
@author(Kieron Morris <[email protected]>)
|
||||||
}
|
}
|
||||||
unit contextswitcher;
|
unit contextswitcher;
|
||||||
|
|
||||||
{$ASMMODE intel}
|
|
||||||
|
|
||||||
interface
|
interface
|
||||||
|
|
||||||
uses
|
implementation;
|
||||||
idt, isrmanager, processmanager, proctypes, util, syslog, tracer;
|
|
||||||
|
|
||||||
{ Initialise: overwrite IDT gate 32 with our custom ISR. }
|
|
||||||
procedure init;
|
|
||||||
|
|
||||||
{ No idle ESP variable needed — idle is now a formal process (PID 0)
|
|
||||||
with its SavedESP managed like any other process. }
|
|
||||||
|
|
||||||
implementation
|
|
||||||
|
|
||||||
{ -----------------------------------------------------------------------
|
|
||||||
do_context_switch_work
|
|
||||||
Pascal helper called from the assembly ISR. Receives the current ESP
|
|
||||||
(pointing to the GS..EFLAGS save area), dispatches timer hooks, sends
|
|
||||||
EOI, runs the scheduler and returns the ESP for the next context.
|
|
||||||
Uses register calling convention: saved_esp in EAX, result in EAX.
|
|
||||||
----------------------------------------------------------------------- }
|
|
||||||
function do_context_switch_work(saved_esp : uint32) : uint32;
|
|
||||||
var
|
|
||||||
next : PProcessContext;
|
|
||||||
begin
|
|
||||||
{ 1. Save ESP into the current process }
|
|
||||||
processmanager.CurrentProcess^.SavedESP := saved_esp;
|
|
||||||
|
|
||||||
{ 2. Dispatch all hooks registered on interrupt 32 (timer hooks).
|
|
||||||
This fires TMR_0_ISR.Main which in turn fires BDA tick,
|
|
||||||
graphics refresh, USB hotplug, etc. }
|
|
||||||
isrmanager.dispatchHooks(32);
|
|
||||||
|
|
||||||
{ 3. Send End-Of-Interrupt to the master PIC }
|
|
||||||
outb($20, $20);
|
|
||||||
|
|
||||||
{ 4. Pick the next process to run (always returns non-nil; idle as fallback) }
|
|
||||||
next := processmanager.scheduler_pick_next;
|
|
||||||
processmanager.CurrentProcess := next;
|
|
||||||
|
|
||||||
{ 5. Return the selected process ESP }
|
|
||||||
do_context_switch_work := next^.SavedESP;
|
|
||||||
end;
|
|
||||||
|
|
||||||
{ -----------------------------------------------------------------------
|
|
||||||
context_switch_isr
|
|
||||||
Naked assembly ISR that replaces ISR_32 (IRQ0 / PIT timer).
|
|
||||||
|
|
||||||
Stack on entry (pushed by CPU):
|
|
||||||
[ESP+8] EFLAGS
|
|
||||||
[ESP+4] CS
|
|
||||||
[ESP+0] EIP
|
|
||||||
|
|
||||||
We push general-purpose and segment registers, call the Pascal helper,
|
|
||||||
switch ESP to the returned value, pop registers and IRETD.
|
|
||||||
----------------------------------------------------------------------- }
|
|
||||||
procedure context_switch_isr; assembler; nostackframe;
|
|
||||||
asm
|
|
||||||
{ Save all general-purpose registers (EAX,ECX,EDX,EBX,ESP,EBP,ESI,EDI) }
|
|
||||||
pushad
|
|
||||||
|
|
||||||
{ Save segment registers }
|
|
||||||
push ds
|
|
||||||
push es
|
|
||||||
push fs
|
|
||||||
push gs
|
|
||||||
|
|
||||||
{ Load kernel data segments }
|
|
||||||
mov ax, $10
|
|
||||||
mov ds, ax
|
|
||||||
mov es, ax
|
|
||||||
mov fs, ax
|
|
||||||
mov gs, ax
|
|
||||||
|
|
||||||
{ Call Pascal helper: EAX = current ESP (register calling convention).
|
|
||||||
Returns new ESP in EAX. }
|
|
||||||
mov eax, esp
|
|
||||||
call do_context_switch_work
|
|
||||||
mov esp, eax
|
|
||||||
|
|
||||||
{ Restore segment registers }
|
|
||||||
pop gs
|
|
||||||
pop fs
|
|
||||||
pop es
|
|
||||||
pop ds
|
|
||||||
|
|
||||||
{ Restore general-purpose registers }
|
|
||||||
popad
|
|
||||||
|
|
||||||
{ Return from interrupt }
|
|
||||||
iretd
|
|
||||||
end;
|
|
||||||
|
|
||||||
{ -----------------------------------------------------------------------
|
|
||||||
init
|
|
||||||
Override IDT gate 32 with our custom ISR. Must be called AFTER
|
|
||||||
isrmanager.init so that the default gate has been set up first.
|
|
||||||
----------------------------------------------------------------------- }
|
|
||||||
procedure init;
|
|
||||||
begin
|
|
||||||
idt.set_gate(32, uint32(@context_switch_isr), $08, ISR_RING_0);
|
|
||||||
tracer.push_trace('contextswitcher.init');
|
|
||||||
end;
|
|
||||||
|
|
||||||
end.
|
end.
|
||||||
+5
-2
@@ -22,7 +22,7 @@ unit cpu;
|
|||||||
interface
|
interface
|
||||||
|
|
||||||
uses
|
uses
|
||||||
util, RTC, stdio;
|
util, RTC;
|
||||||
|
|
||||||
type
|
type
|
||||||
PCapabilities_Old = ^TCapabilities_Old;
|
PCapabilities_Old = ^TCapabilities_Old;
|
||||||
@@ -113,10 +113,12 @@ var
|
|||||||
CAP_OLD, CAP_NEW : uint32;
|
CAP_OLD, CAP_NEW : uint32;
|
||||||
|
|
||||||
procedure init();
|
procedure init();
|
||||||
procedure Terminal_Command_CPU(Params : PParamList; stdin_buf, stdout_buf, stderr_buf : POutBuf);
|
|
||||||
|
|
||||||
implementation
|
implementation
|
||||||
|
|
||||||
|
uses
|
||||||
|
stdio;
|
||||||
|
|
||||||
procedure getCPUIdentifier;
|
procedure getCPUIdentifier;
|
||||||
var
|
var
|
||||||
id0, id1, id2 : uint32;
|
id0, id1, id2 : uint32;
|
||||||
@@ -323,6 +325,7 @@ end;
|
|||||||
|
|
||||||
procedure init();
|
procedure init();
|
||||||
begin
|
begin
|
||||||
|
stdio.registerCommand('CPU', @Terminal_Command_CPU, 'CPU Info.');
|
||||||
CPUID.Capabilities0:= PCapabilities_Old(@CAP_OLD);
|
CPUID.Capabilities0:= PCapabilities_Old(@CAP_OLD);
|
||||||
CPUID.Capabilities1:= PCapabilities_New(@CAP_NEW);
|
CPUID.Capabilities1:= PCapabilities_New(@CAP_NEW);
|
||||||
getCPUIdentifier;
|
getCPUIdentifier;
|
||||||
|
|||||||
@@ -91,7 +91,6 @@ function getDeviceInfo(class_code : uint8; subclass_code : uint8; prog_if : uint
|
|||||||
procedure requestConfig(bus : uint8; slot : uint8; func : uint8; row : uint8);
|
procedure requestConfig(bus : uint8; slot : uint8; func : uint8; row : uint8);
|
||||||
procedure writeConfig(bus: uint8; slot : uint8; func : uint8; row : uint8; val : uint32);
|
procedure writeConfig(bus: uint8; slot : uint8; func : uint8; row : uint8; val : uint32);
|
||||||
procedure setBusMaster(bus : uint8; slot : uint8; func : uint8; master : boolean);
|
procedure setBusMaster(bus : uint8; slot : uint8; func : uint8; master : boolean);
|
||||||
procedure enableDevice(bus : uint8; slot : uint8; func : uint8);
|
|
||||||
|
|
||||||
implementation
|
implementation
|
||||||
|
|
||||||
@@ -443,34 +442,4 @@ begin
|
|||||||
pop_trace;
|
pop_trace;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
//Enable device inturrupts and set bus master
|
|
||||||
procedure enableDevice(bus : uint8; slot : uint8; func : uint8);
|
|
||||||
var
|
|
||||||
addr : uint32;
|
|
||||||
cmd : uint32;
|
|
||||||
begin
|
|
||||||
push_trace('PCI.enableDevice');
|
|
||||||
|
|
||||||
addr := ($1 shl 31);
|
|
||||||
addr := addr or (bus shl 16);
|
|
||||||
addr := addr or ((slot) shl 11);
|
|
||||||
addr := addr or ((func) shl 8);
|
|
||||||
addr := addr or ($04 and $FC);
|
|
||||||
|
|
||||||
outl(PCI_CONFIG_ADDRESS_PORT, addr);
|
|
||||||
cmd := inl(PCI_CONFIG_DATA_PORT);
|
|
||||||
cmd := cmd or PCI_COMMAND_MEM_SPACE;
|
|
||||||
cmd := cmd or PCI_COMMAND_BUS_MASTER;
|
|
||||||
cmd := cmd or (3 shl 1);
|
|
||||||
|
|
||||||
//enable interrupts, remove disable interrupt bit maybe
|
|
||||||
cmd := cmd and not PCI_COMMAND_INT_DISABLE;
|
|
||||||
// cmd := cmd and not (1 shl 9);
|
|
||||||
|
|
||||||
outl(PCI_CONFIG_ADDRESS_PORT, addr);
|
|
||||||
outl(PCI_CONFIG_DATA_PORT, cmd);
|
|
||||||
|
|
||||||
pop_trace;
|
|
||||||
end;
|
|
||||||
|
|
||||||
end.
|
end.
|
||||||
@@ -158,9 +158,6 @@ procedure init;
|
|||||||
{ Unit Tests }
|
{ Unit Tests }
|
||||||
procedure UnitTest;
|
procedure UnitTest;
|
||||||
|
|
||||||
{ Terminal command }
|
|
||||||
procedure terminal_command_usb(params : PParamList; stdin_buf, stdout_buf, stderr_buf : POutBuf);
|
|
||||||
|
|
||||||
implementation
|
implementation
|
||||||
|
|
||||||
{ ========================= Globals ========================= }
|
{ ========================= Globals ========================= }
|
||||||
@@ -957,14 +954,11 @@ end;
|
|||||||
procedure usb_check_hotplug;
|
procedure usb_check_hotplug;
|
||||||
var
|
var
|
||||||
i : uint32;
|
i : uint32;
|
||||||
count: uint32;
|
|
||||||
hc : PUSBHCDriver;
|
hc : PUSBHCDriver;
|
||||||
port : uint8;
|
port : uint8;
|
||||||
begin
|
begin
|
||||||
if HCList = nil then exit;
|
if HCList = nil then exit;
|
||||||
count := LL_Size(HCList);
|
for i := 0 to LL_Size(HCList) - 1 do begin
|
||||||
if count = 0 then exit;
|
|
||||||
for i := 0 to count - 1 do begin
|
|
||||||
hc := PUSBHCDriver(LL_Get(HCList, i));
|
hc := PUSBHCDriver(LL_Get(HCList, i));
|
||||||
if (hc <> nil) and hc^.PortChangePending then begin
|
if (hc <> nil) and hc^.PortChangePending then begin
|
||||||
hc^.PortChangePending := false;
|
hc^.PortChangePending := false;
|
||||||
@@ -1106,6 +1100,7 @@ begin
|
|||||||
CompletionHookCount := 0;
|
CompletionHookCount := 0;
|
||||||
for i := 0 to MAX_COMPLETION_HOOKS - 1 do
|
for i := 0 to MAX_COMPLETION_HOOKS - 1 do
|
||||||
CompletionHooks[i] := nil;
|
CompletionHooks[i] := nil;
|
||||||
|
stdio.registerCommand('USB', @terminal_command_usb, 'USB subsystem information.');
|
||||||
syslog.logln('USB Core', 'INIT END.');
|
syslog.logln('USB Core', 'INIT END.');
|
||||||
pop_trace;
|
pop_trace;
|
||||||
end;
|
end;
|
||||||
|
|||||||
@@ -119,12 +119,8 @@ var
|
|||||||
x32, y32 : sint32;
|
x32, y32 : sint32;
|
||||||
r : pchar;
|
r : pchar;
|
||||||
begin
|
begin
|
||||||
{ mouse_wait(0) checks OBF with a short timeout (100 iterations).
|
|
||||||
When it returns true, data is ready — read it directly with inb($60).
|
|
||||||
Do NOT call mouse_read here: it uses mouse_wait_long (100k iterations)
|
|
||||||
and would spin-block the ISR if the next packet byte hasn't arrived yet. }
|
|
||||||
while mouse_wait(0) do begin
|
while mouse_wait(0) do begin
|
||||||
b := inb($60);
|
b := mouse_read;
|
||||||
if Cycle = 0 then begin
|
if Cycle = 0 then begin
|
||||||
if (b AND $08) = $08 then begin
|
if (b AND $08) = $08 then begin
|
||||||
Mouse_Byte[Cycle] := b;
|
Mouse_Byte[Cycle] := b;
|
||||||
|
|||||||
@@ -21,29 +21,6 @@ unit drivertypes;
|
|||||||
|
|
||||||
interface
|
interface
|
||||||
|
|
||||||
const
|
|
||||||
PCI_CONFIG_ADDRESS_PORT = $0CF8;
|
|
||||||
PCI_CONFIG_DATA_PORT = $0CFC;
|
|
||||||
|
|
||||||
PCI_COMMAND_IO_SPACE = $0001;
|
|
||||||
PCI_COMMAND_MEM_SPACE = $0002;
|
|
||||||
PCI_COMMAND_BUS_MASTER = $0004;
|
|
||||||
PCI_COMMAND_SPECIAL_CYC = $0008;
|
|
||||||
PCI_COMMAND_MEM_WRITE = $0010;
|
|
||||||
PCI_COMMAND_VGA_PALETTE = $0020;
|
|
||||||
PCI_COMMAND_PARITY = $0040;
|
|
||||||
PCI_COMMAND_WAIT = $0080;
|
|
||||||
PCI_COMMAND_SERR = $0100;
|
|
||||||
PCI_COMMAND_FAST_BACK = $0200;
|
|
||||||
PCI_COMMAND_INT_DISABLE = $0400;
|
|
||||||
PCI_COMMAND_SERR_ENABLE = $8000;
|
|
||||||
|
|
||||||
PCI_CAP_ID_MSI = $05;
|
|
||||||
|
|
||||||
// Bits in the MSI Control register (16-bit):
|
|
||||||
MSI_CONTROL_ENABLE = 1 shl 0; // Bit 0
|
|
||||||
MSI_CONTROL_64BIT = 1 shl 7; // Bit 7
|
|
||||||
MSI_CONTROL_PVMASK = 1 shl 8; // Bit 8 (optional: per-vector masking)
|
|
||||||
type
|
type
|
||||||
|
|
||||||
PPCI_Device = ^TPCI_Device;
|
PPCI_Device = ^TPCI_Device;
|
||||||
@@ -67,7 +44,6 @@ type
|
|||||||
address1 : uint32;
|
address1 : uint32;
|
||||||
address2 : uint32;
|
address2 : uint32;
|
||||||
address3 : uint32;
|
address3 : uint32;
|
||||||
|
|
||||||
address4 : uint32;
|
address4 : uint32;
|
||||||
address5 : uint32;
|
address5 : uint32;
|
||||||
CIS_pointer : uint32;
|
CIS_pointer : uint32;
|
||||||
|
|||||||
@@ -256,7 +256,6 @@ type
|
|||||||
OnReceive : TTCPReceiveCallback;
|
OnReceive : TTCPReceiveCallback;
|
||||||
OnEvent : TTCPEventCallback;
|
OnEvent : TTCPEventCallback;
|
||||||
UserData : void;
|
UserData : void;
|
||||||
OwnerPID : uint32; { PID of owning process, 0 if none }
|
|
||||||
end;
|
end;
|
||||||
|
|
||||||
TTCB = record
|
TTCB = record
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ uses
|
|||||||
tracer, lmemorymanager,
|
tracer, lmemorymanager,
|
||||||
util, lists,
|
util, lists,
|
||||||
net, nettypes, netutils,
|
net, nettypes, netutils,
|
||||||
eth2, ipv4, stdio;
|
eth2, ipv4;
|
||||||
|
|
||||||
type
|
type
|
||||||
PARPCacheRecord = ^TARPCacheRecord;
|
PARPCacheRecord = ^TARPCacheRecord;
|
||||||
@@ -41,12 +41,11 @@ procedure sendGratuitous;
|
|||||||
procedure sendRequest(ip : puint8);
|
procedure sendRequest(ip : puint8);
|
||||||
procedure send(hType : uint16; pType : uint16; op : uint16; p_context : PPacketContext);
|
procedure send(hType : uint16; pType : uint16; op : uint16; p_context : PPacketContext);
|
||||||
function resolveIP(ip : puint8) : puint8;
|
function resolveIP(ip : puint8) : puint8;
|
||||||
procedure terminal_command_arp(Params : PParamList; stdin_buf, stdout_buf, stderr_buf : POutBuf);
|
|
||||||
|
|
||||||
implementation
|
implementation
|
||||||
|
|
||||||
uses
|
uses
|
||||||
strings;
|
stdio, strings;
|
||||||
|
|
||||||
var
|
var
|
||||||
Registered : Boolean = false;
|
Registered : Boolean = false;
|
||||||
@@ -310,6 +309,7 @@ begin
|
|||||||
writeToLogLn(' L3/ARP: register');
|
writeToLogLn(' L3/ARP: register');
|
||||||
Cache:= LL_New(sizeof(TARPCacheRecord));
|
Cache:= LL_New(sizeof(TARPCacheRecord));
|
||||||
eth2.registerTypePromisc($0806, @recv);
|
eth2.registerTypePromisc($0806, @recv);
|
||||||
|
stdio.registerCommand('ARP', @terminal_command_arp, 'Get ARP Table.');
|
||||||
Registered:= true;
|
Registered:= true;
|
||||||
end;
|
end;
|
||||||
pop_trace;
|
pop_trace;
|
||||||
|
|||||||
@@ -26,18 +26,17 @@ uses
|
|||||||
util, strings,
|
util, strings,
|
||||||
net, nettypes, netutils,
|
net, nettypes, netutils,
|
||||||
lists,
|
lists,
|
||||||
eth2, stdio;
|
eth2;
|
||||||
|
|
||||||
procedure send(p_data : void; p_len : uint16; p_context : PPacketContext);
|
procedure send(p_data : void; p_len : uint16; p_context : PPacketContext);
|
||||||
procedure registerProtocol(Protocol_ID : uint8; recv_callback : TRecvCallback);
|
procedure registerProtocol(Protocol_ID : uint8; recv_callback : TRecvCallback);
|
||||||
function getIPv4Config : PIPv4Configuration;
|
function getIPv4Config : PIPv4Configuration;
|
||||||
procedure register;
|
procedure register;
|
||||||
procedure terminal_command_ifconfig(params : PParamList; stdin_buf, stdout_buf, stderr_buf : POutBuf);
|
|
||||||
|
|
||||||
implementation
|
implementation
|
||||||
|
|
||||||
uses
|
uses
|
||||||
arp;
|
arp, stdio;
|
||||||
|
|
||||||
var
|
var
|
||||||
Registered : Boolean = false;
|
Registered : Boolean = false;
|
||||||
@@ -212,6 +211,7 @@ begin
|
|||||||
end;
|
end;
|
||||||
Config.UP:= false;
|
Config.UP:= false;
|
||||||
eth2.registerType($0800, @recv);
|
eth2.registerType($0800, @recv);
|
||||||
|
stdio.registerCommand('IFCONFIG', @terminal_command_ifconfig, 'Configure Network Settings.');
|
||||||
Registered:= true;
|
Registered:= true;
|
||||||
end;
|
end;
|
||||||
pop_trace;
|
pop_trace;
|
||||||
|
|||||||
+86
-10
File diff suppressed because it is too large.
Load diff
@@ -22,7 +22,7 @@ unit tcp;
|
|||||||
interface
|
interface
|
||||||
|
|
||||||
uses
|
uses
|
||||||
tracer, stdio,
|
tracer,
|
||||||
nettypes, netutils,
|
nettypes, netutils,
|
||||||
ipv4;
|
ipv4;
|
||||||
|
|
||||||
@@ -33,17 +33,13 @@ function accept(listener : PTCPSocket) : PTCPSocket;
|
|||||||
function send(socket : PTCPSocket; p_data : void; p_len : uint16) : TTCPError;
|
function send(socket : PTCPSocket; p_data : void; p_len : uint16) : TTCPError;
|
||||||
function close(socket : PTCPSocket) : TTCPError;
|
function close(socket : PTCPSocket) : TTCPError;
|
||||||
function abort_connection(socket : PTCPSocket) : TTCPError;
|
function abort_connection(socket : PTCPSocket) : TTCPError;
|
||||||
procedure terminal_command_tcpconnect(params : PParamList; stdin_buf, stdout_buf, stderr_buf : POutBuf);
|
|
||||||
procedure terminal_command_tcplisten(params : PParamList; stdin_buf, stdout_buf, stderr_buf : POutBuf);
|
|
||||||
procedure terminal_command_tcphttp(params : PParamList; stdin_buf, stdout_buf, stderr_buf : POutBuf);
|
|
||||||
|
|
||||||
implementation
|
implementation
|
||||||
|
|
||||||
uses
|
uses
|
||||||
lmemorymanager, util, syslog, rand, lists,
|
lmemorymanager, util, syslog, rand, lists,
|
||||||
net, TMR_0_ISR, bios_data_area,
|
net, TMR_0_ISR, bios_data_area,
|
||||||
strings, arp,
|
stdio, strings, arp;
|
||||||
processmanager, proctypes;
|
|
||||||
|
|
||||||
const
|
const
|
||||||
TCP_PROTOCOL_ID = $06;
|
TCP_PROTOCOL_ID = $06;
|
||||||
@@ -229,7 +225,6 @@ begin
|
|||||||
sock^.OnReceive := onRecv;
|
sock^.OnReceive := onRecv;
|
||||||
sock^.OnEvent := onEvt;
|
sock^.OnEvent := onEvt;
|
||||||
sock^.UserData := userData;
|
sock^.UserData := userData;
|
||||||
sock^.OwnerPID := 0;
|
|
||||||
tcb^.Socket := sock;
|
tcb^.Socket := sock;
|
||||||
CreateSocket := sock;
|
CreateSocket := sock;
|
||||||
end;
|
end;
|
||||||
@@ -256,29 +251,10 @@ begin
|
|||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure socket_cleanup(handle : void);
|
|
||||||
var
|
|
||||||
sock : PTCPSocket;
|
|
||||||
begin
|
|
||||||
sock := PTCPSocket(handle);
|
|
||||||
if sock = nil then exit;
|
|
||||||
sock^.OwnerPID := 0; { Prevent DestroySocket from trying to unbind again }
|
|
||||||
abort_connection(sock);
|
|
||||||
end;
|
|
||||||
|
|
||||||
procedure DestroySocket(sock : PTCPSocket);
|
procedure DestroySocket(sock : PTCPSocket);
|
||||||
var
|
|
||||||
owner : PProcessContext;
|
|
||||||
begin
|
begin
|
||||||
push_trace('tcp.DestroySocket');
|
push_trace('tcp.DestroySocket');
|
||||||
if sock <> nil then begin
|
if sock <> nil then begin
|
||||||
{ Remove resource binding from owning process }
|
|
||||||
if sock^.OwnerPID <> 0 then begin
|
|
||||||
owner := processmanager.findByID(sock^.OwnerPID);
|
|
||||||
sock^.OwnerPID := 0;
|
|
||||||
if owner <> nil then
|
|
||||||
processmanager.unbindResourceNoCleanup(owner, void(sock));
|
|
||||||
end;
|
|
||||||
if sock^.TCB <> nil then begin
|
if sock^.TCB <> nil then begin
|
||||||
sock^.TCB^.Socket := nil;
|
sock^.TCB^.Socket := nil;
|
||||||
DestroyTCB(sock^.TCB);
|
DestroyTCB(sock^.TCB);
|
||||||
@@ -1393,12 +1369,6 @@ begin
|
|||||||
|
|
||||||
sock := CreateSocket(tcb, context^.OnReceive, context^.OnEvent, context^.UserData);
|
sock := CreateSocket(tcb, context^.OnReceive, context^.OnEvent, context^.UserData);
|
||||||
|
|
||||||
{ Auto-bind socket to calling process for cleanup on process death }
|
|
||||||
if processmanager.CurrentProcess <> nil then begin
|
|
||||||
sock^.OwnerPID := processmanager.CurrentProcess^.ProcessID;
|
|
||||||
processmanager.bindResource(processmanager.CurrentProcess, rkSocket, void(sock), @socket_cleanup);
|
|
||||||
end;
|
|
||||||
|
|
||||||
AddTCB(tcb);
|
AddTCB(tcb);
|
||||||
|
|
||||||
{ Send SYN (includes MSS option via SendSegment) }
|
{ Send SYN (includes MSS option via SendSegment) }
|
||||||
@@ -1432,13 +1402,6 @@ begin
|
|||||||
if tcb^.BacklogMax = 0 then tcb^.BacklogMax := 5; { default backlog }
|
if tcb^.BacklogMax = 0 then tcb^.BacklogMax := 5; { default backlog }
|
||||||
|
|
||||||
sock := CreateSocket(tcb, context^.OnReceive, context^.OnEvent, context^.UserData);
|
sock := CreateSocket(tcb, context^.OnReceive, context^.OnEvent, context^.UserData);
|
||||||
|
|
||||||
{ Auto-bind socket to calling process for cleanup on process death }
|
|
||||||
if processmanager.CurrentProcess <> nil then begin
|
|
||||||
sock^.OwnerPID := processmanager.CurrentProcess^.ProcessID;
|
|
||||||
processmanager.bindResource(processmanager.CurrentProcess, rkSocket, void(sock), @socket_cleanup);
|
|
||||||
end;
|
|
||||||
|
|
||||||
AddTCB(tcb);
|
AddTCB(tcb);
|
||||||
|
|
||||||
listen := sock;
|
listen := sock;
|
||||||
@@ -1903,6 +1866,9 @@ begin
|
|||||||
Connections := DL_New(sizeof(uint32));
|
Connections := DL_New(sizeof(uint32));
|
||||||
ipv4.registerProtocol(TCP_PROTOCOL_ID, @ProcessPacket);
|
ipv4.registerProtocol(TCP_PROTOCOL_ID, @ProcessPacket);
|
||||||
TMR_0_ISR.hook(uint32(@TimerTick));
|
TMR_0_ISR.hook(uint32(@TimerTick));
|
||||||
|
stdio.registerCommand('TCPCONNECT', @terminal_command_tcpconnect, 'Connect to a TCP host and send Hello World.');
|
||||||
|
stdio.registerCommand('TCPLISTEN', @terminal_command_tcplisten, 'Listen on a TCP port and log received data.');
|
||||||
|
stdio.registerCommand('TCPHTTP', @terminal_command_tcphttp, 'Send HTTP GET to a host IP (port 80 default).');
|
||||||
Registered := true;
|
Registered := true;
|
||||||
syslog.logln('TCP', 'TCP registered.');
|
syslog.logln('TCP', 'TCP registered.');
|
||||||
end;
|
end;
|
||||||
|
|||||||
Loaded 20 of 110 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user