fix get_inf for network

Author: jedeoric

Makefile

@@ -93,8 +93,8 @@ kernel: $(SOURCE)
 	@echo "########################################################"
 	@$(AS) --verbose -s -tnone --debug-info -o kernel_bank0.ld65 -DWITH_TWILIGHTE_BOARD=1 src/kernel_bank0.s $(ASFLAGS) > output.log
 	@echo "WITH_TWILIGHTE_BOARD">$(PATH_PACKAGE_ROM)/kernelus.lst
-	@$(AS) --verbose -s -tnone --debug-info -o kernelus.ld65  $(SOURCE) $(ASFLAGS) > output.log
-	@$(LD) -C cfg/kernel.cfg tmp/kernelsd.ld65 tmp/kernel_bank0.ld65 tmp/kernel_main_memory.ld65 tmp/kernel.lib -m kernelus.map -DWITH_TWILIGHTE_BOARD=1 -Ln kernelus.sym > output.log
+	@$(AS) --verbose -s -tnone --debug-info -o kernelus.ld65 $(SOURCE) $(ASFLAGS) > output.log
+	@$(LD) -C cfg/kernel.cfg tmp/kernelsd.ld65 tmp/kernel_bank0.ld65 tmp/kernel_main_memory.ld65 tmp/kernel.lib -m kernelus.map -DWITH_TWILIGHTE_BOARD=1 -Ln kernelus.sym  > output.log
 	@cp kernel.rom kernelus.rom
 	@cp kernelus.rom $(PATH_PACKAGE_ROM)/
 

buildr64.sh

@@ -1,11 +1,13 @@
 #! /bin/bash
 #make
-NAME_TO_BUILD=k2023-2.r64
+NAME_TO_BUILD=k2025-1.r64
+
+make
 
 cp ../../shell/develop/shell.rom $NAME_TO_BUILD
 cat basicus2.rom >> $NAME_TO_BUILD
 cat kernelus.rom >> $NAME_TO_BUILD
-cat ../../empty-rom/empty-rom.rom  >> $NAME_TO_BUILD
+cat kernel8.rom >> $NAME_TO_BUILD
 
 cp $NAME_TO_BUILD /mnt/s/devus.r64
 # NAME_TO_BUILD2=k2023-1.r64

run.sh

@@ -85,7 +85,7 @@ fi
 echo "##########"
 echo "# Bank 8 #"
 echo "##########"
-ld65 -C cfg/rom.cfg tmp/kernel_bank8.ld65 tmp/kernel_bank0.ld65 tmp/kernel_main_memory.ld65 tmp/kernel_bank8.lib src/kernel8/orixlibs/ksocket/usr/share/ksocket/2025.1/ksocket.lib  src/kernel8/orixlibs/ch395/usr/share/ch395/2024.4/ch395.lib -o kernel8.rom -Ln tmp/kernel8sd.sym -m tmp/memmap8.txt -vm
+ld65 -C cfg/rom.cfg tmp/kernel_bank8.ld65 tmp/kernel_bank0.ld65 tmp/kernel_main_memory.ld65 tmp/kernel_bank8.lib src/kernel8/orixlibs/ksocket/usr/share/ksocket/2025.1/ksocket.lib src/kernel8/orixlibs/kch395/usr/share/kch395/2025.1/kch395.lib src/kernel8/orixlibs/ch395/usr/share/ch395/2024.4/ch395.lib -o kernel8.rom -Ln tmp/kernel8sd.sym -m tmp/memmap8.txt -vm
 
 RET=$?
 if [ $RET != 0 ]
@@ -112,6 +112,7 @@ ld65  -C cfg/kernel.cfg -DWITH_SDCARD_FOR_ROOT=1 tmp/kernelsd.ld65 tmp/kernel_ba
 # dependencies/orix-sdk/bin/relocbin.py3 -o tmp/sfbtest -2 tmp/1000 tmp/1256
 # cp tmp/sfbtest $ORICUTRON_PATH/sdcard/bin/
 
+echo Build autoboot
 cl65 -ttelestrat tests/functions/network/netchk.s -o tmp/1000 --start-addr 2048
 cl65 -ttelestrat tests/functions/network/netchk.s -o tmp/1256 --start-addr 2304
 dependencies/orix-sdk/bin/relocbin.py3 -o tmp/netchk -2 tmp/1000 tmp/1256

src/functions/lib_mng/XBANK_ROUTINE.s

@@ -15,6 +15,8 @@ XNETWORK_START_ROUTINE := XBANK_ROUTINE
 .segment "BANK7"
 
 .proc XBANK_ROUTINE
+
+
     pha
     lda     #<$C000
     sta     VEXBNK+1

src/functions/network/init_network.s

@@ -11,6 +11,7 @@
 .import ch395_dhcp_enable
 
 .import ch395_get_ip_inf
+.import kch395_get_ip_inf
 
 .import KERNEL_NETWORK_FLAG
 .import KERNEL_NETWORK_SOCKET_LIST
@@ -63,14 +64,19 @@
 
     cmp     #KERNEL_NETWORK_STATE_NOT_INITIALIZED
     beq     @initialize
+
     cmp     #KERNEL_NETWORK_STATE_CHIP_INITIALIZED
     beq     @checking_cable
+
     cmp     #KERNEL_NETWORK_CABLE_DISCONNECTED
     beq     @checking_cable
+
     cmp     #KERNEL_NETWORK_CABLE_CONNECTED
     beq     @start_dhcp
+
     cmp     #KERNEL_NETWORK_STARTING_DHCP
     beq     @start_dhcp
+
     rts
 
 @initialize:
@@ -107,8 +113,8 @@
     ; Check IP
     lda     #<RES
     ldx     #>RES
-    jsr     ch395_get_ip_inf
-
+    ;jsr     ch395_get_ip_inf
+    jsr     kch395_get_ip_inf
     lda     RES
     cmp     #$00
     beq     @dhcp_not_started

src/kernel.asm

@@ -176,6 +176,7 @@ start_rom:
 	lda     #CH376_SET_USB_MODE_CODE_SDCARD
 .else
   lda     #CH376_SET_USB_MODE_CODE_USB_HOST_SOF_PACKAGE_AUTOMATICALLY
+  .out "Building usb device kernel"
 .endif
 
   sta     KERNEL_CH376_MOUNT
@@ -494,6 +495,7 @@ init_malloc_busy_table:
   ; ****************************************************************************
   ; Set stage for kernel init
 
+
   lda     #KERNEL_START_NETWORK
   jsr     XNETWORK_START_ROUTINE
 

src/kernel8/bpm.tml

@@ -24,3 +24,4 @@ orix_minimal_kernel_version = "2024.1"
 [dependencies]
 ch395 = "2024.4"
 ksocket = "2025.1"
+kch395 = "2025.1"

src/libs/ch376-lib/src/ch376.s

@@ -143,7 +143,7 @@ loop:
      .warning "Build for sdcard by default"
 	lda     #CH376_SET_USB_MODE_CODE_SDCARD
 .else
-    .warning "Build by usb key"
+    .warning "[Default] Build for usb key"
     lda     #CH376_SET_USB_MODE_CODE_USB_HOST_SOF_PACKAGE_AUTOMATICALLY
 .endif
     lda     KERNEL_CH376_MOUNT

tests/functions/network/netchk.s

@@ -63,7 +63,6 @@ ptr_recv := userzp + 5
 
 
 start_adress:
-
     malloc #4096
     cmp     #$00
     beq     @not_oom
@@ -72,6 +71,7 @@ start_adress:
     print str_oom
     crlf
     rts
+
 @not_oom:
     sta     ptr_recv
     sty     ptr_recv+1
@@ -85,7 +85,7 @@ start_adress:
 @start:
     dec     retry
     beq     @end
-
+    nop
     ; print str_bank_id_given
     lda     #KERNEL_START_NETWORK    ; Mode
     BRK_TELEMON $01 ; Get network state
@@ -112,12 +112,13 @@ start_adress:
     crlf
     rts
 
-
+nop
 
 @fully_started:
+    crlf
     print str_fully_started
     crlf
-    jmp     @socket
+    rts
 
 @disconnected:
     print str_cable_disconnected
@@ -127,12 +128,12 @@ start_adress:
 @connected:
     print str_cable_connected
     crlf
-    jmp     @waiting
+    print str_starting_dhcp
+    jmp     @start
 
 @dhcp_starting:
-    print str_starting_dhcp
-    crlf
-    jmp     @waiting
+    print #'.'
+    jmp     @start
 
 @dhcp_started:
     print str_started_dhcp
@@ -151,6 +152,12 @@ start_adress:
 @socket:
 
 @loop_socket:
+    ;lda     ip ; 12
+    ;ldy     #00 ; 0 because the number is 12 (from A)
+    ;print_int  ,2, 2 ; an arg is skipped because the number is from register
+   ; lda     #' '
+;    BRK_TELEMON XWR0
+    nop
     print str_socket
 
 
@@ -202,7 +209,7 @@ start_adress:
     sta     RES + 1
     ldy     #18
     ldx     #$00
-
+    nop
     lda     #KERNEL_SEND_NETWORK ; Connect
     BRK_TELEMON $01
     cmp     #$00
@@ -287,6 +294,7 @@ str_socket_error:
     .byte $81, "Socket open error",0
 
 ip:
+    ;.byte 213,186,33,19
     .byte 192,168,1,77
 
 str_invalid_socket:
@@ -299,7 +307,7 @@ str_waiting:
     .asciiz "Waiting ..."
 
 str_started_dhcp:
-    .asciiz "Started dhcp !!"
+    .asciiz "Dhcp Started !"
 
 str_starting_dhcp:
     .asciiz "Starting dhcp"
@@ -312,7 +320,7 @@ str_cable_disconnected:
 
 str_cable_connected:
     .asciiz "Cable connected"
-
+nop
 
     ; sta     tmp1
     ; stx     tmp2