Procházet zdrojové kódy

Find a good balance of buffer sizes

This seem to perform well at disk access and network transfers.
Morio před 2 roky
rodič
revize
79409d401c
2 změnil soubory, kde provedl 6 přidání a 19 odebrání
  1. 5 18
      platformio.ini
  2. 1 1
      src/ZuluSCSI_config.h

+ 5 - 18
platformio.ini

@@ -140,16 +140,6 @@ board_build.core = earlephilhower
 extra_scripts = src/build_bootloader.py
 ldscript_bootloader = lib/ZuluSCSI_platform_RP2040/rp2040_btldr.ld
 board_build.ldscript = lib/ZuluSCSI_platform_RP2040/rp2040-daynaport.ld
-debug_tool = cmsis-dap
-debug_build_flags =
-    -O2 -ggdb -g3
-    ; The values can be adjusted down to get a debug build to fit to SRAM
-    ;-DLOGBUFSIZE=2048
-    ;-DPREFETCH_BUFFER_SIZE=1024
-    ;-DSCSI2SD_BUFFER_SIZE=32768
-    ; This controls the depth of 2 x NETWORK_PACKET_MAX_SIZE (1520 bytes)
-    ; For example a queue size of 10 would be 10 x 2 x 1520 = 30400 bytes
-    -DNETWORK_PACKET_QUEUE_SIZE=20
 lib_deps =
     SdFat=https://github.com/rabbitholecomputing/SdFat#2.2.0-gpt
     minIni
@@ -168,20 +158,17 @@ build_flags =
     -DZULUSCSI_NETWORK
     -DZULUSCSI_DAYNAPORT
 ; These take a large portion of the SRAM and can be adjusted
-; It is important to leave enough free space for USB serial to work
-;   Around 4096 bytes seems to be enough.
-    -DLOGBUFSIZE=2048
-    -DPREFETCH_BUFFER_SIZE=2048
-    -DSCSI2SD_BUFFER_SIZE=32768
+    -DLOGBUFSIZE=8138
+    -DPREFETCH_BUFFER_SIZE=8138
+    -DSCSI2SD_BUFFER_SIZE=57344
     ; This controls the depth of 2 x NETWORK_PACKET_MAX_SIZE (1520 bytes)
     ; For example a queue size of 10 would be 10 x 2 x 1520 = 30400 bytes
-    -DNETWORK_PACKET_QUEUE_SIZE=25
+    -DNETWORK_PACKET_QUEUE_SIZE=18
 ; build flags mirroring the framework-arduinopico#v3.6.0-DaynaPORT static library build
     -DPICO_CYW43_ARCH_POLL=1
 	-DCYW43_LWIP=0
 	-DCYW43_USE_OTP_MAC=0
-;  More SRAM can be freed by disabling USB serial logging
-;    -DPIO_FRAMEWORK_ARDUINO_NO_USB
+    -DPIO_FRAMEWORK_ARDUINO_NO_USB
 
 ; Variant of RP2040 platform, based on Raspberry Pico board and a carrier PCB
 ; Differs in pinout from ZuluSCSI_RP2040 platform, but shares most of the code.

+ 1 - 1
src/ZuluSCSI_config.h

@@ -80,7 +80,7 @@
 #define DRIVEINFO_OPTICAL   {"ZULUSCSI", "CDROM",     PLATFORM_REVISION, ""}
 #define DRIVEINFO_FLOPPY    {"ZULUSCSI", "FLOPPY",    PLATFORM_REVISION, ""}
 #define DRIVEINFO_MAGOPT    {"ZULUSCSI", "MO_DRIVE",  PLATFORM_REVISION, ""}
-#define DRIVEINFO_NETWORK   {"ZULUSCSI", "NETWORK",   PLATFORM_REVISION, ""}
+#define DRIVEINFO_NETWORK   {"Dayna",    "SCSI/Link",       "2.0f", ""}
 #define DRIVEINFO_TAPE      {"ZULUSCSI", "TAPE",      PLATFORM_REVISION, ""}
 
 // Default SCSI drive information when Apple quirks are enabled