fix test

Author: jedeoric

Makefile

@@ -38,8 +38,11 @@ init:
 	@mkdir -p build/usr/src/kernel/
 
 kernel: $(SOURCE)
+	@mkdir -p tmp/
 	@echo Rom are built in $(PATH_PACKAGE_ROM)
-	@echo Build kernelsd.rom for Twilighte board
+	@echo "########################################################"
+	@echo "#  Build kernelsd.rom for Twilighte board              #"
+	@echo "########################################################"
 	@$(AS) --cpu 6502 -tnone src/functions/strings/xminma.asm -o tmp/xminma.o
 	@$(AS) --cpu 6502 -tnone src/functions/bank_mng/search_free_bank.s -o tmp/search_free_bank.o
 	@$(AS) --cpu 6502 -tnone src/functions/bank_mng/kernel_free_bank.s -o tmp/kernel_free_bank.o

run.sh

@@ -6,23 +6,30 @@ ORICUTRON_PATH="/mnt/c/Users/plifp/OneDrive/oric/projets/jedeoric/oricutron_assi
 CA65_INC=/usr/share/cc65/asminc/
 # -DWITH_DEBUG=1
 
+
+build_file() {
+    local file="$1"
+    local path="$2"
+    #echo Build $file
+    ca65 --cpu 6502 -tnone $path/$file.s -o tmp/$file.o
+    RET=$?
+    if [ $RET != 0 ]
+    then
+        echo Error
+        exit
+    fi
+}
+
 ca65 --cpu 6502 -tnone src/functions/strings/xminma.asm -o tmp/xminma.o
 ca65 --cpu 6502 -tnone src/functions/bank_mng/switch_to_kernel_extended.s -o tmp/switch_to_kernel_extended.o
 ca65 --cpu 6502 -tnone src/functions/bank_mng/kernel_restore_banking_states.s -o tmp/kernel_restore_banking_states.o
 ca65 --cpu 6502 -tnone src/functions/lib_mng/XBANK_ROUTINE.s -o tmp/xbank_routine.o
 ca65 --cpu 6502 -tnone src/functions/network/init_network.s -o tmp/init_network.o
 ca65 --cpu 6502 -tnone src/functions/network/xsocket.s -o tmp/xsocket.o
-ca65 --cpu 6502 -tnone src/functions/network/close_sockets_by_pid.s -o tmp/close_sockets_by_pid.o
-
-RET=$?
-if [ $RET != 0 ]
-then
-    echo Error
-    exit
-fi
+build_file "close_sockets_by_pid" "src/functions/network"
+build_file "xconnect" "src/functions/network"
+build_file "xsend" "src/functions/network"
 
-ca65 --cpu 6502 -tnone src/functions/network/xconnect.s -o tmp/xconnect.o
-ca65 --cpu 6502 -tnone src/functions/network/xsend.s -o tmp/xsend.o
 ca65 --cpu 6502 -tnone src/functions/network/xclose_socket.s -o tmp/xclose_socket.o
 
 RET=$?

src/functions/network/close_sockets_by_pid.s

@@ -11,6 +11,7 @@
 .import kernel_process
 
 .include   "../../kernel8/orixlibs/ch395/usr/include/asm/ch395.inc"
+.include   "../../kernel8/orixlibs/ksocket/usr/include/asm/socket.inc"
 .include   "../../include/kernel.inc"
 .include   "../../include/process.inc"
 .include   "../../include/network.inc"
@@ -26,14 +27,15 @@
     sta     TR1
 
 @restart:
-	lda     #<KERNEL_NETWORK_SOCKET_PID
+	lda     #<KERNEL_NETWORK_SOCKET_PID ; D393
 	ldy     #>KERNEL_NETWORK_SOCKET_PID
 
+
     sta     ADDRESS_READ_BETWEEN_BANK_DOUBLON
-    sty     ADDRESS_READ_BETWEEN_BANK_DOUBLON+1
+    sty     ADDRESS_READ_BETWEEN_BANK_DOUBLON + 1
 
-    ldx     TR1
-    ldy     #$00
+    ldx     #$00
+    ldy     TR1 ; Offset of the socket
     MEMORY_GET_VALUE_FROM_BANK ; A contains the value
 
     cmp     kernel_process + kernel_process_struct::kernel_current_process
@@ -42,13 +44,14 @@
 @compute:
     inc     TR1
     lda     TR1
-    cmp     #$08
+
+    cmp     #NETWORK_MAX_SOCKET
     beq     @exit
     bne     @restart
 
-
 @close_socket:
     lda     TR1 ; Socket ID
+
     jsr     ch395_close_socket_sn
 
     ; Set to 0

src/functions/network/init_network.s

@@ -23,6 +23,7 @@
 .include   "../../include/memory.inc"
 
 .proc init_network
+    ; Returns KERNEL_NETWORK_FULLY_STARTED if network is started
 
 	lda     #<KERNEL_NETWORK_FLAG
 	ldy     #>KERNEL_NETWORK_FLAG
@@ -33,6 +34,11 @@
     ldx     #$00
     ldy     #$00
     MEMORY_GET_VALUE_FROM_BANK ; A contains the value
+    cmp     #KERNEL_NETWORK_FULLY_STARTED
+    bne     @check_all
+    rts
+
+@check_all:
     cmp     KERNEL_NETWORK_STATE_NOT_INITIALIZED
     bne     @ch395_found
 
@@ -44,6 +50,7 @@
     rts
 
 @ch395_found:
+    ; FIXME SHould not be done here
 	lda     #<KERNEL_NETWORK_FLAG
 	ldy     #>KERNEL_NETWORK_FLAG
 

src/functions/network/xsocket.s

@@ -4,12 +4,14 @@
 .include   "../../include/kernel.inc"
 .include   "../../include/process.inc"
 .include   "../../include/memory.inc"
+.include   "../../include/network.inc"
 
 .include "telestrat.inc"
 
 .import KERNEL_NETWORK_SOCKET_LIST
 .import KERNEL_NETWORK_SOCKET_DOMAIN
 
+.import init_network
 
 .export XSOCKET_ROUTINE
 
@@ -32,7 +34,7 @@
     ;;@modifyMEM_TR6
     ;;@modifyMEM_TR5
     ;;@returnsX The socket id
-    ;;@returnsA if != -1 then it returns socket id. -1 is return if all socket are used
+    ;;@returnsA if != -1 then it returns socket id. -1 is return if all socket are used, or network is not started or unavailable
 
     ; sock = socket(AF_INET, SOCK_STREAM, 0);
     ;;@```ca65
@@ -58,6 +60,16 @@
     stx     domain ; domain
     sty     type ; Save type
 
+
+    ; Checking if network is started
+    jsr     init_network
+    cmp     #KERNEL_NETWORK_FULLY_STARTED
+    beq     @continue
+;   Error, return INVALID
+    lda     #INVALID_SOCKET
+    rts
+
+@continue:
     ; Looking for available socket
     lda     #$00
     sta     socket
@@ -81,7 +93,6 @@
     bne     @search_free_socket
 
 ;   Error, return INVALID
-
     lda     #INVALID_SOCKET
     rts
 
@@ -105,6 +116,7 @@
     ldy     socket ; Get socket id (index)
     lda     kernel_process + kernel_process_struct::kernel_current_process
     ldx     #$00  ; BANK
+
     MEMORY_PUT_VALUE_TO_BANK KERNEL_NETWORK_SOCKET_PID  ; ADDRESS_READ_BETWEEN_BANK_DOUBLON is already set previously : FIXME
 
     ; Setting CH395

src/functions/process/kernel_kill_process.asm

@@ -32,6 +32,8 @@
   cmp     #128
   bne     @do_not_destroy_socket
 
+
+
   lda     #KERNEL_SOCKET_CLOSE_FROM_PID_NETWORK
   jsr     XNETWORK_START_ROUTINE
 

src/include/memory.inc

@@ -94,7 +94,6 @@
   KERNEL_BANK_PROCESS_ID             .res 64
 .endstruct
 
-
 .macro  MEMORY_PUT_VALUE_TO_BANK address
   ; Put a value into ank
   ; X the id of the bank where the value will be written

src/kernel.asm

@@ -188,8 +188,8 @@ start_rom:
   lda     #$03  ; bank 33 and 34 are reserved (loader/network)
   sta     BUSY_BANK_TABLE_RAM ; Set BUSY BANK_table
   lda     #$00
-  sta     BUSY_BANK_TABLE_RAM+1 ; Set BUSY BANK_table
-  sta     BUSY_BANK_TABLE_RAM+2 ; Set BUSY BANK_table
+  sta     BUSY_BANK_TABLE_RAM + 1 ; Set BUSY BANK_table
+  sta     BUSY_BANK_TABLE_RAM + 2 ; Set BUSY BANK_table
 
 
 @usb_controler_not_detected:
@@ -342,15 +342,15 @@ don_t_display_signature:
   jsr     routine_to_define_19
 
   lda     #64
-  sta     RES+1
+  sta     RES + 1
 
   ; Initialize banks states to Empty
 @L1:
   lda     #$00 ; value to store
   ldx     #$00 ; BANK
   ldy     #$00 ; Offset to write
   MEMORY_PUT_VALUE_TO_BANK KERNEL_BANK_MANAGEMENT
-  dec     RES+1
+  dec     RES + 1
   bne     @L1
 
   ; Displays cursor
@@ -477,7 +477,7 @@ init_malloc_busy_table:
 	ldy     #>($FFF0+1)
 
   sta     ADDRESS_READ_BETWEEN_BANK_DOUBLON
-  sty     ADDRESS_READ_BETWEEN_BANK_DOUBLON+1
+  sty     ADDRESS_READ_BETWEEN_BANK_DOUBLON + 1
 
   ldx     #$04
   ldy     #$00

src/kernel8/src/kernel8.s

@@ -35,7 +35,6 @@ start_rom:
     jmp     XBANK
 
 XBANK:
-
     cmp     #KERNEL_ALLOCATE_BANK
     beq     @allocate_bank