From 143c9a1d927864efbc613cfc2a1cb6eddfbe1729 Mon Sep 17 00:00:00 2001
From: Oliver Graf <oliver@m-e-g-a.org>
Date: Sun, 1 Sep 2024 12:21:47 +0200
Subject: [PATCH] whitespace cleanup

---
 src/hyppo/audiomix.asm           |   46 +-
 src/hyppo/constants.asm          |  192 ++---
 src/hyppo/debug.asm              |    2 +-
 src/hyppo/debugtests.asm         |    2 +-
 src/hyppo/dos.asm                | 1206 +++++++++++++++---------------
 src/hyppo/dos_write.asm          |    2 +-
 src/hyppo/freeze.asm             |    2 +-
 src/hyppo/joyflash.asm           |  428 +++++------
 src/hyppo/keyboard.asm           |    2 +-
 src/hyppo/machine.asm            |    2 +-
 src/hyppo/macros.asm             |    2 +-
 src/hyppo/main.asm               |  688 ++++++++---------
 src/hyppo/mem.asm                |    2 +-
 src/hyppo/process_descriptor.asm |   20 +-
 src/hyppo/sdfat.asm              |   28 +-
 src/hyppo/securemode.asm         |    2 +-
 src/hyppo/syspart.asm            |  222 +++---
 src/hyppo/targetsetup.asm        |   45 +-
 src/hyppo/task.asm               |  110 +--
 src/hyppo/ultimax.asm            |    2 +-
 src/hyppo/virtual_f011.asm       |    2 +-
 21 files changed, 1506 insertions(+), 1501 deletions(-)

diff --git a/src/hyppo/audiomix.asm b/src/hyppo/audiomix.asm
index 10be0651a..c4f88013b 100644
--- a/src/hyppo/audiomix.asm
+++ b/src/hyppo/audiomix.asm
@@ -1,12 +1,12 @@
 ;; /*  -------------------------------------------------------------------
 ;;     MEGA65 "HYPPOBOOT" Combined boot and hypervisor ROM.
-;;     Paul Gardner-Stephen, 2014-2019.
+;;     Paul Gardner-Stephen, 2014-2024.
 ;;     ---------------------------------------------------------------- */
 audiomix_setup:
 
         ;; Set all audio mixer coefficients to silent by default
         ldx #$00
-        txa 
+        txa
 aml1:
         jsr audiomix_setcoefficient
         inx
@@ -18,10 +18,10 @@ aml1:
         jsr audiomix_set2coefficients
         ldx #$de
         jsr audiomix_set2coefficients
-	;; And also for speaker / HDMI audio outputs
-	;; Now we have a fun problem: Internal speakers need it MUCH louder than HDMI
-	;; and we wouldn't be able to set the two independently.
-	lda #$ff
+        ;; And also for speaker / HDMI audio outputs
+        ;; Now we have a fun problem: Internal speakers need it MUCH louder than HDMI
+        ;; and we wouldn't be able to set the two independently.
+        lda #$ff
         ldx #$1e
         jsr audiomix_set2coefficients
         ldx #$3e
@@ -29,17 +29,17 @@ aml1:
 
         jsr audio_set_stereo
 
-	;; Set OPL / FM / SFX / Adlib volume to max on all channels
-	lda #$0c
+        ;; Set OPL / FM / SFX / Adlib volume to max on all channels
+        lda #$0c
 fmvolloop:
-	tax
-	lda #$ff
-	jsr audiomix_set2coefficients
-	txa
-	clc
-	adc #$20
-	bcc fmvolloop
-	
+        tax
+        lda #$ff
+        jsr audiomix_set2coefficients
+        txa
+        clc
+        adc #$20
+        bcc fmvolloop
+
 
 audio_set_mono:
         ;; Left and right SID volume levels
@@ -81,7 +81,7 @@ audiomix_set_sid_lr_coefficients:
         ldx #$32
         jmp audiomix_set2coefficients
 
-audiomix_set_sid_rl_coefficients:	
+audiomix_set_sid_rl_coefficients:
         ldx #$c2
         jsr audiomix_set2coefficients
         ldx #$d2
@@ -97,23 +97,23 @@ audiomix_set_sid_rl_coefficients:
         ldx #$20
         jsr audiomix_set2coefficients
         ldx #$30
-        jmp audiomix_set2coefficients        	
-	
+        jmp audiomix_set2coefficients
+
 audio_set_stereo:
         ;; Left and right SID volume levels
         ;; for stereo operation
         lda #$be
-	jsr audiomix_set_sid_lr_coefficients
+        jsr audiomix_set_sid_lr_coefficients
         lda #$40
-	jmp audiomix_set_sid_rl_coefficients
+        jmp audiomix_set_sid_rl_coefficients
 
 audio_set_stereomirrored:
         ;; Left and right SID volume levels
         ;; for stereo operation
         lda #$40
-	jsr audiomix_set_sid_lr_coefficients
+        jsr audiomix_set_sid_lr_coefficients
         lda #$be
-	jmp audiomix_set_sid_rl_coefficients
+        jmp audiomix_set_sid_rl_coefficients
 
 audiomix_setcoefficient:
         stx audiomix_addr
diff --git a/src/hyppo/constants.asm b/src/hyppo/constants.asm
index e9aa2479a..c9a9eccf8 100644
--- a/src/hyppo/constants.asm
+++ b/src/hyppo/constants.asm
@@ -1,150 +1,150 @@
 ;; /*  -------------------------------------------------------------------
 ;;     MEGA65 "HYPPOBOOT" Combined boot and hypervisor ROM.
-;;     Paul Gardner-Stephen, 2014-2019.
+;;     Paul Gardner-Stephen, 2014-2024.
 ;;     ---------------------------------------------------------------- */
 
-         os_version = $0102
-         dos_version = $0103
-         constant_partition_type_fat32_chs = $0b
-         constant_partition_type_fat32_lba = $0c
-         constant_partition_type_megea65_sys = $41
+        os_version = $0102
+        dos_version = $0103
+        constant_partition_type_fat32_chs = $0b
+        constant_partition_type_fat32_lba = $0c
+        constant_partition_type_megea65_sys = $41
 
         ;; DOS error codes
         ;;
-         dos_errorcode_partition_not_interesting = $01
-         dos_errorcode_bad_signature = $02
-         dos_errorcode_is_small_fat = $03
-         dos_errorcode_too_many_reserved_clusters = $04
-         dos_errorcode_not_two_fats = $05
-         dos_errorcode_too_few_clusters = $06
-         dos_errorcode_readwrite_timeout = $07
-         dos_errorcode_partition_error = $08
-         dos_errorcode_invalid_address = $10
-         dos_errorcode_illegal_value = $11
-         dos_errorcode_read_error = $20
-         dos_errorcode_write_error = $21
-         dos_errorcode_no_such_disk = $80
-         dos_errorcode_name_too_long = $81
-         dos_errorcode_not_implemented = $82
-         dos_errorcode_file_too_long = $83
-         dos_errorcode_too_many_open_files = $84
-         dos_errorcode_invalid_cluster = $85
-         dos_errorcode_is_a_directory = $86
-         dos_errorcode_not_a_directory = $87
-         dos_errorcode_file_not_found = $88
-         dos_errorcode_invalid_file_descriptor = $89
-         dos_errorcode_image_wrong_length = $8A
-         dos_errorcode_image_fragmented = $8B
-         dos_errorcode_no_space = $8C
-         dos_errorcode_file_exists = $8D
-         dos_errorcode_directory_full = $8E
-         dos_errorcode_double_attach = $8F
-         dos_errorcode_eof = $FF
+        dos_errorcode_partition_not_interesting = $01
+        dos_errorcode_bad_signature = $02
+        dos_errorcode_is_small_fat = $03
+        dos_errorcode_too_many_reserved_clusters = $04
+        dos_errorcode_not_two_fats = $05
+        dos_errorcode_too_few_clusters = $06
+        dos_errorcode_readwrite_timeout = $07
+        dos_errorcode_partition_error = $08
+        dos_errorcode_invalid_address = $10
+        dos_errorcode_illegal_value = $11
+        dos_errorcode_read_error = $20
+        dos_errorcode_write_error = $21
+        dos_errorcode_no_such_disk = $80
+        dos_errorcode_name_too_long = $81
+        dos_errorcode_not_implemented = $82
+        dos_errorcode_file_too_long = $83
+        dos_errorcode_too_many_open_files = $84
+        dos_errorcode_invalid_cluster = $85
+        dos_errorcode_is_a_directory = $86
+        dos_errorcode_not_a_directory = $87
+        dos_errorcode_file_not_found = $88
+        dos_errorcode_invalid_file_descriptor = $89
+        dos_errorcode_image_wrong_length = $8A
+        dos_errorcode_image_fragmented = $8B
+        dos_errorcode_no_space = $8C
+        dos_errorcode_file_exists = $8D
+        dos_errorcode_directory_full = $8E
+        dos_errorcode_double_attach = $8F
+        dos_errorcode_eof = $FF
 
         ;; FAT directory entry constants
         ;;
         ;; these seem to be offsets into the STANDARD FAT32 header (DO NOT CHANGE)
         ;;
-         fs_fat32_dirent_offset_attributes = 11
-         fs_fat32_dirent_offset_shortname = 0
-         fs_fat32_dirent_offset_create_tenthsofseconds = 13
-         fs_fat32_dirent_offset_create_time = 14
-         fs_fat32_dirent_offset_create_date = 16
-         fs_fat32_dirent_offset_access_date = 18
-         fs_fat32_dirent_offset_clusters_high = 20
-         fs_fat32_dirent_offset_modify_time = 22
-         fs_fat32_dirent_offset_modify_date = 24
-         fs_fat32_dirent_offset_clusters_low = 26
-         fs_fat32_dirent_offset_file_length = 28
+        fs_fat32_dirent_offset_attributes = 11
+        fs_fat32_dirent_offset_shortname = 0
+        fs_fat32_dirent_offset_create_tenthsofseconds = 13
+        fs_fat32_dirent_offset_create_time = 14
+        fs_fat32_dirent_offset_create_date = 16
+        fs_fat32_dirent_offset_access_date = 18
+        fs_fat32_dirent_offset_clusters_high = 20
+        fs_fat32_dirent_offset_modify_time = 22
+        fs_fat32_dirent_offset_modify_date = 24
+        fs_fat32_dirent_offset_clusters_low = 26
+        fs_fat32_dirent_offset_file_length = 28
 
         ;; VFAT long file name entry constants
         ;;
         ;; These are the offsets of the various fields in a directory entry, when
         ;; used to store a long-file-name fragment.
         ;;
-         fs_fat32_dirent_offset_lfn_part_number = 0
-         fs_fat32_dirent_offset_lfn_type = 12 ;; $0C
-         fs_fat32_dirent_offset_lfn_checksum = 13
-         fs_fat32_dirent_offset_lfn_part1_chars = 5
-         fs_fat32_dirent_offset_lfn_part1_start = 1
-         fs_fat32_dirent_offset_lfn_part2_chars = 6
-         fs_fat32_dirent_offset_lfn_part2_start = 14
-         fs_fat32_dirent_offset_lfn_part3_chars = 2
-         fs_fat32_dirent_offset_lfn_part3_start = 28
-
-         fs_fat32_attribute_isreadonly = $01
-         fs_fat32_attribute_ishidden = $02
-         fs_fat32_attribute_issystem = $04
-         fs_fat32_attribute_isvolumelabel = $08
-         fs_fat32_attribute_isdirectory = $10
-         fs_fat32_attribute_archiveset = $20
+        fs_fat32_dirent_offset_lfn_part_number = 0
+        fs_fat32_dirent_offset_lfn_type = 12 ;; $0C
+        fs_fat32_dirent_offset_lfn_checksum = 13
+        fs_fat32_dirent_offset_lfn_part1_chars = 5
+        fs_fat32_dirent_offset_lfn_part1_start = 1
+        fs_fat32_dirent_offset_lfn_part2_chars = 6
+        fs_fat32_dirent_offset_lfn_part2_start = 14
+        fs_fat32_dirent_offset_lfn_part3_chars = 2
+        fs_fat32_dirent_offset_lfn_part3_start = 28
+
+        fs_fat32_attribute_isreadonly = $01
+        fs_fat32_attribute_ishidden = $02
+        fs_fat32_attribute_issystem = $04
+        fs_fat32_attribute_isvolumelabel = $08
+        fs_fat32_attribute_isdirectory = $10
+        fs_fat32_attribute_archiveset = $20
 
         ;; Possible file modes
         ;;
-         dos_filemode_directoryaccess = $80
-         dos_filemode_end_of_directory = $81
-         dos_filemode_readonly = 0
-         dos_filemode_readwrite = 1
+        dos_filemode_directoryaccess = $80
+        dos_filemode_end_of_directory = $81
+        dos_filemode_readonly = 0
+        dos_filemode_readwrite = 1
 
         ;; 256-byte fixed size records for REL emulaton
         ;;
-         dos_filemode_relative = 2
+        dos_filemode_relative = 2
 
         ;; Each disk entry consists of;
         ;;
         ;; Offset $00 - starting sector (4 bytes)
-         fs_start_sector = $00
+        fs_start_sector = $00
 
         ;; Offset $04 - sector count (4 bytes)
-         fs_sector_count = $04
+        fs_sector_count = $04
 
         ;; Offset $08 - Filesystem type & media source ($0x = FAT32, $xF = SD card, others reserved for now)
-         fs_type_and_source = $08
+        fs_type_and_source = $08
 
         ;; Remaining bytes are filesystem dependent:
         ;; For FAT32:
         ;;
         ;; Offset $09 - length of fat (4 bytes) (FAT starts at fs_fat32_system_sectors)
-         fs_fat32_length_of_fat = $09
+        fs_fat32_length_of_fat = $09
 
         ;; Offset $0D - system sectors (2 bytes)
-         fs_fat32_system_sectors = $0D
+        fs_fat32_system_sectors = $0D
 
         ;; Offset $0F - reserved clusters (1 byte)
-         fs_fat32_reserved_clusters = $0F
+        fs_fat32_reserved_clusters = $0F
 
         ;; Offset $10 - root dir cluster (2 bytes)
-         fs_fat32_root_dir_cluster = $10
+        fs_fat32_root_dir_cluster = $10
 
         ;; Offset $12 - cluster count (4 bytes)
-         fs_fat32_cluster_count = $12
+        fs_fat32_cluster_count = $12
 
         ;; Offset $16 - sectors per cluster
-         fs_fat32_sectors_per_cluster = $16
+        fs_fat32_sectors_per_cluster = $16
 
         ;; Offset $17 - copies of FAT
-         fs_fat32_fat_copies = $17
+        fs_fat32_fat_copies = $17
 
         ;; Offset $18 - first sector of cluster zero (4 bytes)
-         fs_fat32_cluster0_sector = $18
+        fs_fat32_cluster0_sector = $18
 
         ;; Offset $1C - Four spare bytes.
 
-         freeze_prep_none = 0
-         freeze_prep_palette0 = 2
-         freeze_prep_palette1 = 4
-         freeze_prep_palette2 = 6
-         freeze_prep_palette3 = 8
-         freeze_prep_stash_sd_buffer_and_regs = 10
-         freeze_prep_thumbnail = 12
-         freeze_prep_viciv = 14
- 	 freeze_prep_hyperregs = 16
-
-         d81_image_max_namelen = 32
-         d81_image_flag_mounted = 1
-         d81_image_flag_write_en = 4
-
-         syspart_error_readerror = $01
-         syspart_error_badslotnum = $02
-         syspart_error_badmagic = $42
-         syspart_error_nosyspart = $ff
+        freeze_prep_none = 0
+        freeze_prep_palette0 = 2
+        freeze_prep_palette1 = 4
+        freeze_prep_palette2 = 6
+        freeze_prep_palette3 = 8
+        freeze_prep_stash_sd_buffer_and_regs = 10
+        freeze_prep_thumbnail = 12
+        freeze_prep_viciv = 14
+        freeze_prep_hyperregs = 16
+
+        d81_image_max_namelen = 32
+        d81_image_flag_mounted = 1
+        d81_image_flag_write_en = 4
+
+        syspart_error_readerror = $01
+        syspart_error_badslotnum = $02
+        syspart_error_badmagic = $42
+        syspart_error_nosyspart = $ff
diff --git a/src/hyppo/debug.asm b/src/hyppo/debug.asm
index 5e1d540ef..0deeee7c8 100644
--- a/src/hyppo/debug.asm
+++ b/src/hyppo/debug.asm
@@ -1,6 +1,6 @@
 ;; /*  -------------------------------------------------------------------
 ;;     MEGA65 "HYPPOBOOT" Combined boot and hypervisor ROM.
-;;     Paul Gardner-Stephen, 2014-2019.
+;;     Paul Gardner-Stephen, 2014-2024.
 
 ;;     These routines are included in the hickup-build-process primarily
 ;;     for debug purposes. It is anticipated that these routines will
diff --git a/src/hyppo/debugtests.asm b/src/hyppo/debugtests.asm
index 9c43f030e..726d550ad 100644
--- a/src/hyppo/debugtests.asm
+++ b/src/hyppo/debugtests.asm
@@ -1,6 +1,6 @@
 ;; /*  -------------------------------------------------------------------
 ;;     MEGA65 "HYPPOBOOT" Combined boot and hypervisor ROM.
-;;     Paul Gardner-Stephen, 2014-2019.
+;;     Paul Gardner-Stephen, 2014-2024.
 
 ;;     This file is included in hyppo.a65 in the reset_entry routine.
 ;;     i.e., anything put here is executed before reset resumes.
diff --git a/src/hyppo/dos.asm b/src/hyppo/dos.asm
index 448a78bb2..f5a83f4b5 100644
--- a/src/hyppo/dos.asm
+++ b/src/hyppo/dos.asm
@@ -38,7 +38,7 @@ dos_and_process_trap_table:
         !16 trap_dos_selectdrive
         !16 trap_dos_getdisksize              ;; not currently implemented
         !16 trap_dos_getcwd                   ;; not currently implemented
-        !16 trap_dos_chdir                    
+        !16 trap_dos_chdir
         !16 trap_dos_mkdir                    ;; not currently implemented
 
         ;; $10 - $1E
@@ -125,31 +125,31 @@ trap_serial_monitor_write:
 ;;         ========================
 
 trap_task_get_mapping:
-	jsr hypervisor_setup_copy_region
-	bcc @bad
-	ldy #5
+        jsr hypervisor_setup_copy_region
+        bcc @bad
+        ldy #5
 @copyloop:
-	lda hypervisor_maplohi,y
-	sta (<hypervisor_userspace_copy_vector),y
-	dey
-	bpl @copyloop
-	sec
+        lda hypervisor_maplohi,y
+        sta (<hypervisor_userspace_copy_vector),y
+        dey
+        bpl @copyloop
+        sec
 @bad:
-	jmp return_from_trap_with_carry_flag
+        jmp return_from_trap_with_carry_flag
 
 trap_task_set_mapping:
-	jsr hypervisor_setup_copy_region
-	bcc @bad2
-	ldy #5
+        jsr hypervisor_setup_copy_region
+        bcc @bad2
+        ldy #5
 @copyloop2:
-	lda (<hypervisor_userspace_copy_vector),y
-	sta hypervisor_maplohi,y
-	dey
-	bpl @copyloop2
-	sec
+        lda (<hypervisor_userspace_copy_vector),y
+        sta hypervisor_maplohi,y
+        dey
+        bpl @copyloop2
+        sec
 @bad2:
-	jmp return_from_trap_with_carry_flag
-	
+        jmp return_from_trap_with_carry_flag
+
 trap_task_toggle_force_4502:
         lda hypervisor_feature_enables
         eor #$20
@@ -209,10 +209,10 @@ trap_dos_closeall:
 ;;         ========================
 
 trap_dos_loadfile_attic:
-	lda #$08  		; Set address to $8xxxxxx to access attic RAM
-	!8 $2c 		; BIT $xxxx to skip lda #$00 below
-	;; FALL THROUGH
-	
+        lda #$08  		; Set address to $8xxxxxx to access attic RAM
+        !8 $2c 		; BIT $xxxx to skip lda #$00 below
+        ;; FALL THROUGH
+
 trap_dos_loadfile:
 
         ;; Only allow loading into lower 16MB to avoid possibility of writing
@@ -303,150 +303,150 @@ trap_dos_getcurrentdrive:
 
 trap_dos_mkfile:
 
-	;; XXX Filename must already be set.
-	;; XXX Must be a file in the current directory only.
-	;; XXX Can only create normal files, not directories
-	;;     (change attribute after).
-	;; XXX Only supports 8.3 names for now.
-	;; XXX Filenames without extension might still cause problems.
-	;; XXX Allocates 512KB at a time, i.e., a full FAT sector's
-	;;     worth of clusters.
-	;; XXX Allocates a contiguous block, so that D81s etc can
-	;;     be created, and guaranteed contiguous on the storage,
-	;;     so that they can be mounted.
-	;; XXX Size of file specified in $ZZYYXX, i.e., limit of 16MB.
-	;; XXX Doesn't handle full file systems (or ones without enough space
-	;;     free properly. Should check candidate cluster number is not too
-	;;     high, and abort if it is.
-
-	;; First, make sure the file doesn't already exist
-	jsr dos_findfile
-	bcc +
-	;; File exists, so abort
-	clc
-	lda #dos_errorcode_file_exists
-	sta dos_error_code
-	jmp return_from_trap_with_failure
+        ;; XXX Filename must already be set.
+        ;; XXX Must be a file in the current directory only.
+        ;; XXX Can only create normal files, not directories
+        ;;     (change attribute after).
+        ;; XXX Only supports 8.3 names for now.
+        ;; XXX Filenames without extension might still cause problems.
+        ;; XXX Allocates 512KB at a time, i.e., a full FAT sector's
+        ;;     worth of clusters.
+        ;; XXX Allocates a contiguous block, so that D81s etc can
+        ;;     be created, and guaranteed contiguous on the storage,
+        ;;     so that they can be mounted.
+        ;; XXX Size of file specified in $ZZYYXX, i.e., limit of 16MB.
+        ;; XXX Doesn't handle full file systems (or ones without enough space
+        ;;     free properly. Should check candidate cluster number is not too
+        ;;     high, and abort if it is.
+
+        ;; First, make sure the file doesn't already exist
+        jsr dos_findfile
+        bcc +
+        ;; File exists, so abort
+        clc
+        lda #dos_errorcode_file_exists
+        sta dos_error_code
+        jmp return_from_trap_with_failure
 +
 
-	;; We need 1 FAT sector per 512KB of data.
-	;; I.e., shift ZZ right by three bits to get number
-	;; of empty FAT sectors we need to indicate sufficient space.
-	lda hypervisor_z
-	lsr
-	lsr
-	lsr
-	clc
-	adc #$01 
-	sta dos_scratch_byte_1
-
-	;; Now go looking for empty FAT sectors
-	;; Start at cluster 128, and add 128 each time to step through
-	;; them.
-	;; This skips the first sector of FAT, which always has some used
-	;; bits, and ensures we can allocate on a whole sector basis.
-	lda #128
-	sta <(zptempv32+0)
-	lda #$00
-	sta <(zptempv32+1)
-	sta <(zptempv32+2)
-	sta <(zptempv32+3)
-
-	;; Initially 0 empty pages found
-	lda #0
-	sta dos_scratch_byte_2
-
-	jsr sd_map_sectorbuffer
+        ;; We need 1 FAT sector per 512KB of data.
+        ;; I.e., shift ZZ right by three bits to get number
+        ;; of empty FAT sectors we need to indicate sufficient space.
+        lda hypervisor_z
+        lsr
+        lsr
+        lsr
+        clc
+        adc #$01
+        sta dos_scratch_byte_1
+
+        ;; Now go looking for empty FAT sectors
+        ;; Start at cluster 128, and add 128 each time to step through
+        ;; them.
+        ;; This skips the first sector of FAT, which always has some used
+        ;; bits, and ensures we can allocate on a whole sector basis.
+        lda #128
+        sta <(zptempv32+0)
+        lda #$00
+        sta <(zptempv32+1)
+        sta <(zptempv32+2)
+        sta <(zptempv32+3)
+
+        ;; Initially 0 empty pages found
+        lda #0
+        sta dos_scratch_byte_2
+
+        jsr sd_map_sectorbuffer
 
 find_empty_fat_page_loop:
-	
-	ldx #3
+
+        ldx #3
 -	lda <zptempv32,x
-	sta dos_current_cluster,x
-	dex
-	bpl -
-
-	jsr read_fat_sector_for_cluster
-	
-	;; Is the page empty
-	ldx #0
+        sta dos_current_cluster,x
+        dex
+        bpl -
+
+        jsr read_fat_sector_for_cluster
+
+        ;; Is the page empty
+        ldx #0
 -	lda sd_sectorbuffer,x
-	bne +
-	lda sd_sectorbuffer+$100,x
-	bne +
+        bne +
+        lda sd_sectorbuffer+$100,x
+        bne +
 
-	inx
-	bne -
+        inx
+        bne -
 +
-	
-	;; Z=1 if FAT sector all unallocated, Z=0 otherwise
-	beq fat_sector_is_empty
-
-	;; Reset empty FAT sector counter
-	lda #0
-	sta dos_scratch_byte_2
-	jmp +
-	
-fat_sector_is_empty:	
-	inc dos_scratch_byte_2
-	lda dos_scratch_byte_2
-	cmp dos_scratch_byte_1
-	beq found_enough_contiguous_free_space
+
+        ;; Z=1 if FAT sector all unallocated, Z=0 otherwise
+        beq fat_sector_is_empty
+
+        ;; Reset empty FAT sector counter
+        lda #0
+        sta dos_scratch_byte_2
+        jmp +
+
+fat_sector_is_empty:
+        inc dos_scratch_byte_2
+        lda dos_scratch_byte_2
+        cmp dos_scratch_byte_1
+        beq found_enough_contiguous_free_space
 +
-	;; Need to find another
-	lda #$80
-	clc
-	adc <(zptempv32+0)
-	sta <(zptempv32+0)
-	lda <(zptempv32+1)
-	adc #0
-	sta <(zptempv32+1)
-	lda <(zptempv32+2)
-	adc #0
-	sta <(zptempv32+2)
-	lda <(zptempv32+3)
-	adc #0
-	sta <(zptempv32+3)
-
-	;; XXX Check that we haven't hit the end of the file system
-	
-	jmp find_empty_fat_page_loop
+        ;; Need to find another
+        lda #$80
+        clc
+        adc <(zptempv32+0)
+        sta <(zptempv32+0)
+        lda <(zptempv32+1)
+        adc #0
+        sta <(zptempv32+1)
+        lda <(zptempv32+2)
+        adc #0
+        sta <(zptempv32+2)
+        lda <(zptempv32+3)
+        adc #0
+        sta <(zptempv32+3)
+
+        ;; XXX Check that we haven't hit the end of the file system
+
+        jmp find_empty_fat_page_loop
 
 found_enough_contiguous_free_space:
 
-	;; Space begins dos_scratch_byte_2 FAT sectors before here,
-	;; so rewind back to there by taking $80 away for each count.
-	dec dos_scratch_byte_2
-	
+        ;; Space begins dos_scratch_byte_2 FAT sectors before here,
+        ;; so rewind back to there by taking $80 away for each count.
+        dec dos_scratch_byte_2
+
 -	lda dos_scratch_byte_2
-	beq +
-	lda <(zptempv32+0)
-	sec
-	sbc #$80
-	sta <(zptempv32+0)
-	lda <(zptempv32+1)
-	sbc #0
-	sta <(zptempv32+1)
-	lda <(zptempv32+2)
-	sbc #0
-	sta <(zptempv32+2)
-	lda <(zptempv32+3)
-	sbc #0
-	sta <(zptempv32+3)
-	dec dos_scratch_byte_2
-	jmp -
+        beq +
+        lda <(zptempv32+0)
+        sec
+        sbc #$80
+        sta <(zptempv32+0)
+        lda <(zptempv32+1)
+        sbc #0
+        sta <(zptempv32+1)
+        lda <(zptempv32+2)
+        sbc #0
+        sta <(zptempv32+2)
+        lda <(zptempv32+3)
+        sbc #0
+        sta <(zptempv32+3)
+        dec dos_scratch_byte_2
+        jmp -
 +
-	;; zptempv32 now contains the starting cluster for our file
-
-	;; Find directory entry slot
-	jsr dos_find_free_dirent
-	bcs +
-	;; Couldn't find a free dirent, so return whatever error
-	;; we have been indicated.
-	rts
+        ;; zptempv32 now contains the starting cluster for our file
+
+        ;; Find directory entry slot
+        jsr dos_find_free_dirent
+        bcs +
+        ;; Couldn't find a free dirent, so return whatever error
+        ;; we have been indicated.
+        rts
 +
 
-	;; Show offset in directory sector for dirent
+        ;; Show offset in directory sector for dirent
 ;;	lda dos_scratch_vector+0
 ;;	sta $0700
 ;;	lda dos_scratch_vector+1
@@ -466,253 +466,253 @@ found_enough_contiguous_free_space:
 ;;	sta $0708,x
 ;;	dex
 ;;	bpl !-
-	
-	;; XXX Populate dirent structure
-	;; dirent: erase old contents
-	ldy #31
-	lda #0
+
+        ;; XXX Populate dirent structure
+        ;; dirent: erase old contents
+        ldy #31
+        lda #0
 -	sta (<dos_scratch_vector),y
-	;; Put spaces in filename field (first 11 bytes)
-	cpy #11
-	bne foo1
-	lda #$20
-foo1:	
-	dey
-	bpl -
-	;; dirent: filename
-	;; Split filename at dot
-	ldy #0
-	ldx #fs_fat32_dirent_offset_shortname
+        ;; Put spaces in filename field (first 11 bytes)
+        cpy #11
+        bne foo1
+        lda #$20
+foo1:
+        dey
+        bpl -
+        ;; dirent: filename
+        ;; Split filename at dot
+        ldy #0
+        ldx #fs_fat32_dirent_offset_shortname
 -	lda dos_requested_filename,x
-	cmp #$2e
-	bne not_dot
-	ldy #8-1
-	bne was_dot
+        cmp #$2e
+        bne not_dot
+        ldy #8-1
+        bne was_dot
 not_dot:
-	;; Don't write nul char if filename is short
-	cmp #0
-	beq +
-	sta (<dos_scratch_vector),y
-was_dot:	
-	beq +
-	inx
-	iny
-	cpy #11
-	bne -
+        ;; Don't write nul char if filename is short
+        cmp #0
+        beq +
+        sta (<dos_scratch_vector),y
+was_dot:
+        beq +
+        inx
+        iny
+        cpy #11
+        bne -
 +
-	
-	;; dirent: attributes
-	ldy #fs_fat32_dirent_offset_attributes
-	lda #$20 ;; Archive bit set
-	sta (<dos_scratch_vector),y
-	;; dirent: start cluster
-	ldy #fs_fat32_dirent_offset_clusters_low
-	lda <(zptempv32+0)
-	sta (<dos_scratch_vector),y
-	iny
-	lda <(zptempv32+1)
-	sta (<dos_scratch_vector),y
-	ldy #fs_fat32_dirent_offset_clusters_high
-	lda <(zptempv32+2)
-	sta (<dos_scratch_vector),y
-	iny
-	lda <(zptempv32+3)
-	sta (<dos_scratch_vector),y	
-	;; dirent: file length
-	ldy #fs_fat32_dirent_offset_file_length
-	lda hypervisor_x
-	sta (<dos_scratch_vector),y
-	iny
-	lda hypervisor_y
-	sta (<dos_scratch_vector),y
-	iny
-	lda hypervisor_z
-	sta (<dos_scratch_vector),y
-	iny
-	lda #0
-	sta (<dos_scratch_vector),y
-
-	;; Write sector back with updated dirent
-	jsr write_non_mbr_sector
-	jsr sd_wait_for_ready
-		
-	;; Update both FATs to make the allocation
-
-	;; Work out how many sectors full of incrementing clusters
-	;; we need.
-	lda dos_scratch_byte_1
-	sta dos_scratch_byte_2
-mkfile_fat_write_loop:	
-	;; Get the (currently empty) sector
-	ldx #3
+
+        ;; dirent: attributes
+        ldy #fs_fat32_dirent_offset_attributes
+        lda #$20 ;; Archive bit set
+        sta (<dos_scratch_vector),y
+        ;; dirent: start cluster
+        ldy #fs_fat32_dirent_offset_clusters_low
+        lda <(zptempv32+0)
+        sta (<dos_scratch_vector),y
+        iny
+        lda <(zptempv32+1)
+        sta (<dos_scratch_vector),y
+        ldy #fs_fat32_dirent_offset_clusters_high
+        lda <(zptempv32+2)
+        sta (<dos_scratch_vector),y
+        iny
+        lda <(zptempv32+3)
+        sta (<dos_scratch_vector),y
+        ;; dirent: file length
+        ldy #fs_fat32_dirent_offset_file_length
+        lda hypervisor_x
+        sta (<dos_scratch_vector),y
+        iny
+        lda hypervisor_y
+        sta (<dos_scratch_vector),y
+        iny
+        lda hypervisor_z
+        sta (<dos_scratch_vector),y
+        iny
+        lda #0
+        sta (<dos_scratch_vector),y
+
+        ;; Write sector back with updated dirent
+        jsr write_non_mbr_sector
+        jsr sd_wait_for_ready
+
+        ;; Update both FATs to make the allocation
+
+        ;; Work out how many sectors full of incrementing clusters
+        ;; we need.
+        lda dos_scratch_byte_1
+        sta dos_scratch_byte_2
+mkfile_fat_write_loop:
+        ;; Get the (currently empty) sector
+        ldx #3
 -	lda <zptempv32,x
-	sta dos_current_cluster,x
-	dex
-	bpl -
-	jsr read_fat_sector_for_cluster
+        sta dos_current_cluster,x
+        dex
+        bpl -
+        jsr read_fat_sector_for_cluster
 
-	;; Update cluster number and write it into the field
-	ldy #0
+        ;; Update cluster number and write it into the field
+        ldy #0
 -
-	;; XXX Rework to use 32-bit pseudo register
-	lda <(zptempv32+0)
-	clc
-	adc #1
-	sta <(zptempv32+0)
-	sta sd_sectorbuffer,y
-	iny
-	lda <(zptempv32+1)
-	adc #0
-	sta <(zptempv32+1)
-	sta sd_sectorbuffer,y
-	iny
-	lda <(zptempv32+2)
-	adc #0
-	sta <(zptempv32+2)
-	sta sd_sectorbuffer,y
-	iny
-	lda <(zptempv32+3)
-	adc #0
-	sta <(zptempv32+3)
-	sta sd_sectorbuffer,y
-	iny
-	bne -
+        ;; XXX Rework to use 32-bit pseudo register
+        lda <(zptempv32+0)
+        clc
+        adc #1
+        sta <(zptempv32+0)
+        sta sd_sectorbuffer,y
+        iny
+        lda <(zptempv32+1)
+        adc #0
+        sta <(zptempv32+1)
+        sta sd_sectorbuffer,y
+        iny
+        lda <(zptempv32+2)
+        adc #0
+        sta <(zptempv32+2)
+        sta sd_sectorbuffer,y
+        iny
+        lda <(zptempv32+3)
+        adc #0
+        sta <(zptempv32+3)
+        sta sd_sectorbuffer,y
+        iny
+        bne -
 -
-	lda <(zptempv32+0)
-	clc
-	adc #1
-	sta <(zptempv32+0)
-	sta sd_sectorbuffer+$100,y
-	iny
-	lda <(zptempv32+1)
-	adc #0
-	sta <(zptempv32+1)
-	sta sd_sectorbuffer+$100,y
-	iny
-	lda <(zptempv32+2)
-	adc #0
-	sta <(zptempv32+2)
-	sta sd_sectorbuffer+$100,y
-	iny
-	lda <(zptempv32+3)
-	adc #0
-	sta <(zptempv32+3)
-	sta sd_sectorbuffer+$100,y
-	iny
-	bne -
-
-	;; If the last FAT sector for this file, then
-	;; the last cluster entry should be $0FFFFFF8 to mark
-	;; end of file.
-	lda dos_scratch_byte_2
-	cmp #1
-	bne +
-	lda #$F8
-	sta $dffc
-	lda #$FF
-	sta $dffd
-	sta $dffe
-	lda #$0F
-	sta $dfff
-+	
-	;; Write FAT sector to FAT1
-	jsr write_non_mbr_sector
-	jsr sd_wait_for_ready
-
-	;; Work out where it will be in the 2nd FAT
-	lda dos_disk_table_offset
-	ora #fs_fat32_length_of_fat
-	tay
-	ldx #0
+        lda <(zptempv32+0)
+        clc
+        adc #1
+        sta <(zptempv32+0)
+        sta sd_sectorbuffer+$100,y
+        iny
+        lda <(zptempv32+1)
+        adc #0
+        sta <(zptempv32+1)
+        sta sd_sectorbuffer+$100,y
+        iny
+        lda <(zptempv32+2)
+        adc #0
+        sta <(zptempv32+2)
+        sta sd_sectorbuffer+$100,y
+        iny
+        lda <(zptempv32+3)
+        adc #0
+        sta <(zptempv32+3)
+        sta sd_sectorbuffer+$100,y
+        iny
+        bne -
+
+        ;; If the last FAT sector for this file, then
+        ;; the last cluster entry should be $0FFFFFF8 to mark
+        ;; end of file.
+        lda dos_scratch_byte_2
+        cmp #1
+        bne +
+        lda #$F8
+        sta $dffc
+        lda #$FF
+        sta $dffd
+        sta $dffe
+        lda #$0F
+        sta $dfff
++
+        ;; Write FAT sector to FAT1
+        jsr write_non_mbr_sector
+        jsr sd_wait_for_ready
+
+        ;; Work out where it will be in the 2nd FAT
+        lda dos_disk_table_offset
+        ora #fs_fat32_length_of_fat
+        tay
+        ldx #0
 -	lda $d681,x
-	adc dos_disk_table,y
-	iny
-	inx
-	cpx #4
-	bne -
-	
-	;; Write FAT sector to FAT2
-	jsr write_non_mbr_sector
-	jsr sd_wait_for_ready
-	
-	;; More FAT sectors to go?
-	dec dos_scratch_byte_2
-	beq +
-	jmp mkfile_fat_write_loop
-+		
-
-	;; All done: File has been created.
-	jmp return_from_trap_with_success
+        adc dos_disk_table,y
+        iny
+        inx
+        cpx #4
+        bne -
+
+        ;; Write FAT sector to FAT2
+        jsr write_non_mbr_sector
+        jsr sd_wait_for_ready
+
+        ;; More FAT sectors to go?
+        dec dos_scratch_byte_2
+        beq +
+        jmp mkfile_fat_write_loop
++
+
+        ;; All done: File has been created.
+        jmp return_from_trap_with_success
 
 dos_find_free_dirent:
-	;; Start by opening the directory.
-	jsr dos_opendir
-	;; Then look for free directory entry slots.
-	jsr sd_map_sectorbuffer
-
-	;; FALL THROUGH
-	
-empty_dirent_search_loop:	
-	
-	jsr dos_file_read_current_sector
-
-	;; Look for free dirent in first half of each sector.
-	ldx #0
-	lda #$de
-	sta <(dos_scratch_vector+1)
+        ;; Start by opening the directory.
+        jsr dos_opendir
+        ;; Then look for free directory entry slots.
+        jsr sd_map_sectorbuffer
+
+        ;; FALL THROUGH
+
+empty_dirent_search_loop:
+
+        jsr dos_file_read_current_sector
+
+        ;; Look for free dirent in first half of each sector.
+        ldx #0
+        lda #$de
+        sta <(dos_scratch_vector+1)
 -	lda sd_sectorbuffer,x
-	cmp #$00 ;; vacant
-	beq available_dirent_slot
-	cmp #$e5 ;; deleted
-	beq available_dirent_slot
-	txa
-	adc #$20
-	tax
-	bne -
-	inc <(dos_scratch_vector+1)
+        cmp #$00 ;; vacant
+        beq available_dirent_slot
+        cmp #$e5 ;; deleted
+        beq available_dirent_slot
+        txa
+        adc #$20
+        tax
+        bne -
+        inc <(dos_scratch_vector+1)
 -	lda sd_sectorbuffer,x
-	cmp #$00 ;; vacant
-	beq available_dirent_slot
-	cmp #$e5 ;; deleted
-	beq available_dirent_slot
-	txa
-	adc #$20
-	tax
-	bne -
-
-	;; No empty slots in this directory, so see if there any more sectors in
-	;; this directory?
-	jsr dos_file_advance_to_next_sector
-	bcs empty_dirent_search_loop
-
-	;; Directory is full, so return error
-	;; XXX Later we should allow extending the directory by adding another cluster.
-	lda #dos_errorcode_directory_full
-	sta dos_error_code
-	clc
-	rts
-	
-available_dirent_slot:	
-	stx <(dos_scratch_vector+0)
-	
-	sec
-	rts
+        cmp #$00 ;; vacant
+        beq available_dirent_slot
+        cmp #$e5 ;; deleted
+        beq available_dirent_slot
+        txa
+        adc #$20
+        tax
+        bne -
+
+        ;; No empty slots in this directory, so see if there any more sectors in
+        ;; this directory?
+        jsr dos_file_advance_to_next_sector
+        bcs empty_dirent_search_loop
+
+        ;; Directory is full, so return error
+        ;; XXX Later we should allow extending the directory by adding another cluster.
+        lda #dos_errorcode_directory_full
+        sta dos_error_code
+        clc
+        rts
+
+available_dirent_slot:
+        stx <(dos_scratch_vector+0)
+
+        sec
+        rts
 
 ;;         ========================
-	
+
 read_fat_sector_for_cluster:
-	jsr dos_cluster_to_fat_sector
+        jsr dos_cluster_to_fat_sector
 
-	;; Now read the sector
+        ;; Now read the sector
         ldx #3
 -       lda dos_current_cluster,x
         sta $d681,x
         dex
         bpl -
-	jmp sd_readsector
-	
+        jmp sd_readsector
+
 ;;         ========================
-	
+
 trap_dos_opendir:
 
         ;; X = File descriptor
@@ -796,16 +796,16 @@ trap_dos_closedir:
 ;;         ========================
 
 trap_dos_readfile:
-	jsr dos_readfile	
+        jsr dos_readfile
         jmp return_from_trap_with_carry_flag
 
 trap_dos_writefile:
-	jsr dos_writefile	
-	jmp return_from_trap_with_carry_flag
+        jsr dos_writefile
+        jmp return_from_trap_with_carry_flag
 
 trap_dos_rmfile:
         jsr dos_rmfile
-	jmp return_from_trap_with_carry_flag
+        jmp return_from_trap_with_carry_flag
 
 trap_dos_fstat:
         jsr dos_fstat
@@ -814,10 +814,10 @@ trap_dos_fstat:
 ;;         ========================
 
 trap_dos_cdrootdir:
-	ldx hypervisor_x
-	jsr dos_cdroot
-	jmp return_from_trap_with_carry_flag
-	
+        ldx hypervisor_x
+        jsr dos_cdroot
+        jmp return_from_trap_with_carry_flag
+
 trap_dos_chdir:
 
         ;; Opens file in current dirent structure
@@ -839,7 +839,7 @@ tdcd1:
 
 ;;         ========================
 
-	
+
 trap_dos_openfile:
 
         ;; Opens file in current dirent structure
@@ -1064,12 +1064,12 @@ dos_clear_filedescriptors:
         sta currenttask_filedescriptor2
         sta currenttask_filedescriptor3
 
-	;; XXX - Doesn't flush any files open for write
+        ;; XXX - Doesn't flush any files open for write
         sta dos_file_descriptors
         sta dos_file_descriptors+$10
         sta dos_file_descriptors+$20
         sta dos_file_descriptors+$30
-	
+
         sec
         rts
 
@@ -1195,7 +1195,7 @@ dos_initialise_disklist:
 ;;         ========================
 
 dos_consider_partition_entry:
-	
+
         lda #$00
         sta dos_error_code
 
@@ -1934,7 +1934,7 @@ dos_return_error_already_set:
 ;;         ========================
 
 dos_set_current_disk:
-	
+
         ;; Is disk number valid?
         ;;
         ;; INPUT: .X = disk
@@ -1945,9 +1945,9 @@ dos_set_current_disk:
 
         lda #dos_errorcode_no_such_disk
         sta dos_error_code
-	clc
-	rts
-	
+        clc
+        rts
+
 +
         stx dos_disk_current_disk
         txa
@@ -1988,15 +1988,15 @@ dos_cdroot:
         jsr dos_set_current_disk
         bcs dos_cdroot_current_disk_already_set
 
-	;; Could not set disk. Error will be already set
-	clc
-	rts	
+        ;; Could not set disk. Error will be already set
+        clc
+        rts
 
 dos_cdroot_current_disk_already_set:
 
         ;; get offset of disk entry
         ;;
-	
+
         ldx dos_disk_table_offset
         lda dos_disk_table + fs_fat32_root_dir_cluster +0,x
         sta dos_disk_cwd_cluster
@@ -2194,8 +2194,8 @@ dcf_simple:
 ;;         ========================
 
 dos_chdir:
-	;; Works similarly to dos_openfile, i.e. you must first have the
-	;; directory in the dirent structure, found via dos_findfile
+        ;; Works similarly to dos_openfile, i.e. you must first have the
+        ;; directory in the dirent structure, found via dos_findfile
 
         ;; Check if the file is a directory, if so, refuse to open it.
         ;;
@@ -2205,7 +2205,7 @@ dos_chdir:
 
         lda #dos_errorcode_not_a_directory
         jmp dos_return_error
-	
+
 ;;         ========================
 
 dcd_is_a_directory:
@@ -2213,40 +2213,40 @@ dcd_is_a_directory:
         jsr dos_set_current_file_from_dirent
         bcc l3_dos_return_error_already_set
 
-	;; Close the file descriptor opened by dos_set_current_file_from_dirent
-	jsr dos_closefile
+        ;; Close the file descriptor opened by dos_set_current_file_from_dirent
+        jsr dos_closefile
 
-	;; Copy cluster of requesteed directory into disk CWD cluster
-	ldx #3
+        ;; Copy cluster of requesteed directory into disk CWD cluster
+        ldx #3
 dcd1:	lda dos_dirent_cluster,x
-	sta dos_disk_cwd_cluster,x
-	dex
-	bpl dcd1
-
-	;; Check if cluster 0. If so, cd to root directory
-	;; (its a convention to put cluster 0 in references to the root directory
-	;; on some FAT implementations, apparently).
-	
-	ldx #3
-	lda #0
+        sta dos_disk_cwd_cluster,x
+        dex
+        bpl dcd1
+
+        ;; Check if cluster 0. If so, cd to root directory
+        ;; (its a convention to put cluster 0 in references to the root directory
+        ;; on some FAT implementations, apparently).
+
+        ldx #3
+        lda #0
 dcd2:	ora dos_disk_cwd_cluster,x
-	dex
-	bpl dcd2
+        dex
+        bpl dcd2
+
+        cmp #0
+        bne @nonZeroCluster
 
-	cmp #0
-	bne @nonZeroCluster
+        ;; Is cluster 0, so change to root directory
+        jmp dos_cdroot_current_disk_already_set
 
-	;; Is cluster 0, so change to root directory
-	jmp dos_cdroot_current_disk_already_set
-	
 @nonZeroCluster:
-	;; Return success
-	sec
-	rts
+        ;; Return success
+        sec
+        rts
 
 ;;         ========================
-	
-	
+
+
 dos_openfile:
 
         ;; Open the file that is in the dirent structure
@@ -2309,7 +2309,7 @@ l3_dos_return_error_already_set:
 +
         ;; Directory is now open, and we can now iterate through directory entries
         ;;
-	jmp dos_findnext
+        jmp dos_findnext
 
 
 ;;         ========================
@@ -2597,7 +2597,7 @@ eight3char1:
 ;;         ========================
 
         ;; first, check if the entry begins with $E5 marking a deleted file.
-	;; Entry entries we just ignore, as they are totally valid.
+        ;; Entry entries we just ignore, as they are totally valid.
 
         ldy #fs_fat32_dirent_offset_shortname        ;; Y=0 (first char of entry)
         lda (<dos_scratch_vector),y
@@ -2605,10 +2605,10 @@ eight3char1:
         bne +
         jmp drd_deleted_or_invalid_entry
 +
-	cmp #$00  ;; NOTE: In Windows, I've seen #$00 markers equating to the end of direntries (i.e., stop iterating over direntries at this point)
+        cmp #$00  ;; NOTE: In Windows, I've seen #$00 markers equating to the end of direntries (i.e., stop iterating over direntries at this point)
         bne +
-	;; Empty entry, so skip over it
-	jmp drd_deleted_or_invalid_entry
+        ;; Empty entry, so skip over it
+        jmp drd_deleted_or_invalid_entry
 +
         ;; now check the attrib
 
@@ -2642,7 +2642,7 @@ drce_cont0:
         and #$08
         cmp #$08                ;; %00001000 Vol-ID
         bne drce_cont2
-	jmp drce_cont_next_part	; Ignore it
+        jmp drce_cont_next_part	; Ignore it
 
 drce_cont2:
         tya        ;; from safe keeping
@@ -2671,9 +2671,9 @@ drce_cont3:
         jmp drce_normalrecord
 
 drce_ignore:
-	;; Ignore hidden/system files for now
-	;; XXX We should have a flag to enable/disable this behaviour
-	jmp drce_cont_next_part
+        ;; Ignore hidden/system files for now
+        ;; XXX We should have a flag to enable/disable this behaviour
+        jmp drce_cont_next_part
 
 dotdotshortname:
         !text "..         "
@@ -2682,9 +2682,9 @@ dotdotshortname:
 
 drce_longname:
 
-disable_lfn_byte:	
-	jmp drce_cont_next_part
-	
+disable_lfn_byte:
+        jmp drce_cont_next_part
+
         ;; make sure long entry type is "filename" (=$00)
         ;;
         ldy #fs_fat32_dirent_offset_lfn_type
@@ -2940,36 +2940,36 @@ drce6:  lda (<dos_scratch_vector),y
         bne drce6
 
 drce_copied_extension:
-	
-	;; Trim spaces from the end of the filename
-	cpx #0
-	beq @filename0bytes
-	lda #$20
-	cmp dos_dirent_longfilename-1,x
-	bne @nomorespaces
-	dex
-	jmp drce_copied_extension
-	
+
+        ;; Trim spaces from the end of the filename
+        cpx #0
+        beq @filename0bytes
+        lda #$20
+        cmp dos_dirent_longfilename-1,x
+        bne @nomorespaces
+        dex
+        jmp drce_copied_extension
+
 @nomorespaces:
 
-	;; And trim trailing . from file name in case extension
-	;; was all spaces. But don't trim it if the filename starts
-	;; with ., so that we don't mess up . and .. directories
-	lda dos_dirent_longfilename-1,x
-	;; Is last char a . ?
-	cmp #$2e
-	bne @notrailingdot
+        ;; And trim trailing . from file name in case extension
+        ;; was all spaces. But don't trim it if the filename starts
+        ;; with ., so that we don't mess up . and .. directories
+        lda dos_dirent_longfilename-1,x
+        ;; Is last char a . ?
+        cmp #$2e
+        bne @notrailingdot
 
 @hastrailingdot:
-	
-	;; Cut . from end of filename
-	dex
+
+        ;; Cut . from end of filename
+        dex
 
 @notrailingdot:
-	
+
 @filename0bytes:
 
-	;; null terminate short name for convenience in our debugging
+        ;; null terminate short name for convenience in our debugging
         ;;
         lda #$00
         sta dos_dirent_longfilename,x
@@ -3120,7 +3120,7 @@ drd_deleted_or_invalid_entry:
 ddie:   !text "xx drd_deleted_or_invalid_entry"
         !8 0
 }
-	
+
         jsr dos_readdir_advance_to_next_entry
         bcc +
         jmp dos_readdir
@@ -3273,7 +3273,7 @@ dscffd1:
         sta dos_bytes_remaining,x
         dex
         bpl -
-	
+
         sec
         rts
 
@@ -3475,8 +3475,8 @@ dfanc1:
 
         jsr dos_cluster_to_fat_sector
 
-	jsr dos_remember_sd_sector
-	
+        jsr dos_remember_sd_sector
+
         ;; copy from current cluster to SD sector address register
         ;;
         ldx #$03
@@ -3598,37 +3598,37 @@ dfanc_check:
 
 dfanc_ok:
         ;; cluster number is okay
-	jsr dos_restore_sd_sector
+        jsr dos_restore_sd_sector
         sec
         rts
 
 dfanc_fail:
-	jsr dos_restore_sd_sector
+        jsr dos_restore_sd_sector
         lda #dos_errorcode_invalid_cluster
         jmp dos_return_error
 
-	;; Some routines disturb the current SD card sector in the buffer,
-	;; but where the caller might not expect or want this to happen.
-	;; For this reason we have the following convenience routines for
-	;; stashing and restoring the current ready sector.
+        ;; Some routines disturb the current SD card sector in the buffer,
+        ;; but where the caller might not expect or want this to happen.
+        ;; For this reason we have the following convenience routines for
+        ;; stashing and restoring the current ready sector.
 dos_remember_sd_sector:
-	ldx #3
+        ldx #3
 -	lda $d681,x
-	sta dos_stashed_sd_sector_number,x
-	dex
-	bpl -
-	rts
+        sta dos_stashed_sd_sector_number,x
+        dex
+        bpl -
+        rts
 
 dos_restore_sd_sector:
-	ldx #3
+        ldx #3
 -	lda dos_stashed_sd_sector_number,x
-	sta $d681,x
-	dex
-	bpl -
-	jsr sd_readsector
-	rts
-	
-	
+        sta $d681,x
+        dex
+        bpl -
+        jsr sd_readsector
+        rts
+
+
 ;;         ========================
 
 dos_cluster_to_fat_sector:
@@ -3855,7 +3855,7 @@ dos_load_y_based_on_dos_bytes_remaining:
 
 dos_updatereturnsize:
 
-;; 	ldx dos_bytes_remaining+3 
+;; 	ldx dos_bytes_remaining+3
 ;; 	jsr checkpoint_bytetohex
 ;; 	sty lenhex+0
 ;; 	stx lenhex+1
@@ -3871,69 +3871,69 @@ dos_updatereturnsize:
 ;; 	jsr checkpoint_bytetohex
 ;; 	sty lenhex+6
 ;; 	stx lenhex+7
-	
+
 ;; 	jsr checkpoint
 ;; 	!8 0
 ;; 	ascii("$")
-;; lenhex:	
+;; lenhex:
 ;; 	ascii("%%%%%%%% bytes remaining.")
 ;; 	!8 0
-	
-	lda dos_bytes_remaining+0
-	ora dos_bytes_remaining+1
-	ora dos_bytes_remaining+2
-	ora dos_bytes_remaining+3
-	bne +
-
-	;; End of file: So zero bytes returned
-	lda #$00
-	sta hypervisor_x
-	sta hypervisor_y
-	clc
-	rts
-	
+
+        lda dos_bytes_remaining+0
+        ora dos_bytes_remaining+1
+        ora dos_bytes_remaining+2
+        ora dos_bytes_remaining+3
+        bne +
+
+        ;; End of file: So zero bytes returned
+        lda #$00
+        sta hypervisor_x
+        sta hypervisor_y
+        clc
+        rts
+
 +
-	;; Indicate how many bytes we are returning
-	ldx #<$0200
-	ldy #>$0200
-	
-	lda dos_bytes_remaining+2
-	ora dos_bytes_remaining+3
-	bne +   ;; lots more to read
-	lda dos_bytes_remaining+1
-	cmp #2
-	bcs +   ;; at least a whole sector more to read
-
-	;; Only a fractional part of a sector to read, so zero out remaining
-
-	;; Update number of bytes for fractional sector read
-	ldx dos_bytes_remaining+0
-	ldy dos_bytes_remaining+1
-	
-	lda #$00
-	sta dos_bytes_remaining+0
-	;; Actually make it look like 1 sector to go, so we decrement that to zero
-	;; immediately below
-	lda #$02
-	sta dos_bytes_remaining+1
-	;; FALL THROUGH
+        ;; Indicate how many bytes we are returning
+        ldx #<$0200
+        ldy #>$0200
+
+        lda dos_bytes_remaining+2
+        ora dos_bytes_remaining+3
+        bne +   ;; lots more to read
+        lda dos_bytes_remaining+1
+        cmp #2
+        bcs +   ;; at least a whole sector more to read
+
+        ;; Only a fractional part of a sector to read, so zero out remaining
+
+        ;; Update number of bytes for fractional sector read
+        ldx dos_bytes_remaining+0
+        ldy dos_bytes_remaining+1
+
+        lda #$00
+        sta dos_bytes_remaining+0
+        ;; Actually make it look like 1 sector to go, so we decrement that to zero
+        ;; immediately below
+        lda #$02
+        sta dos_bytes_remaining+1
+        ;; FALL THROUGH
 +
-	
-	;; Deduct one sector from the remaining
-	lda dos_bytes_remaining+1
-	sec
-	sbc #2
-	sta dos_bytes_remaining+1
-	lda dos_bytes_remaining+2
-	sbc #0
-	sta dos_bytes_remaining+2
-	lda dos_bytes_remaining+3
-	sbc #0
-	sta dos_bytes_remaining+3
-
-	;; Store number of bytes read in X and Y for calling process
-	stx hypervisor_x
-	sty hypervisor_y
+
+        ;; Deduct one sector from the remaining
+        lda dos_bytes_remaining+1
+        sec
+        sbc #2
+        sta dos_bytes_remaining+1
+        lda dos_bytes_remaining+2
+        sbc #0
+        sta dos_bytes_remaining+2
+        lda dos_bytes_remaining+3
+        sbc #0
+        sta dos_bytes_remaining+3
+
+        ;; Store number of bytes read in X and Y for calling process
+        stx hypervisor_x
+        sty hypervisor_y
 
         jsr sd_map_sectorbuffer
 
@@ -3948,8 +3948,8 @@ dos_readfile:
 +	;; Now read sector and return
         jsr dos_file_read_current_sector
         bcs drwf_readwritesuccess
-	rts
-	
+        rts
+
 ;;         ========================
 
 dos_writefile:
@@ -3968,7 +3968,7 @@ drwf_readwritesuccess:
 
         sec
         rts
-	
+
 ;;         ========================
 
 dos_rmfile:
@@ -4220,7 +4220,7 @@ tdfs:   lda (<dos_scratch_vector),y
         bne tdfs
 
         sec
-        rts       
+        rts
 
 ;;         ========================
 
@@ -4318,7 +4318,7 @@ dos_attach:
         rts
 
 dos_diskattach:
-	;; dos_attach_bits determines on which drive it works
+        ;; dos_attach_bits determines on which drive it works
         ;;
         ;; Assumes only that D81 file name has been set with dos_setname.
         ;;
@@ -4391,46 +4391,46 @@ dos_diskattach:
         ldy <dos_attach_offset
         lda dos_attach_realdrv_bits,y
         trb $d6a1
-        
+
         ;; Set flags to indicate it is mounted (and read-write).
         ;; clear D65 mega disk flag,
         ;; But don't mess up the flags for the 2nd drive
-	lda dos_attach_imgena_bits,y
+        lda dos_attach_imgena_bits,y
         tsb $d68b
-	;; Clear D64 flag
-	lda dos_attach_typeflg_bits,y
+        ;; Clear D64 flag
+        lda dos_attach_typeflg_bits,y
         tax
-	trb $d68a
+        trb $d68a
 
-	;; Check what dos_d81check detected
+        ;; Check what dos_d81check detected
         lda d81_lasttype
         cmp #64
-	bne @not_d64
+        bne @not_d64
+
+        ;; Set D64 flag
+        txa
+        tsb $d68a
+        bra @d81attach_typeset
 
-	;; Set D64 flag
-	txa
-	tsb $d68a
-	bra @d81attach_typeset
-	
 @not_d64:
-	cmp #71
-	bne @not_d71
+        cmp #71
+        bne @not_d71
 
-	;; D71 disk image
-	;; Set both the D64 and the D65 flags to mean "big D64" = D71 image
-	txa
-	tsb $d68a
-	tsb $d68b
-	bra @d81attach_typeset
+        ;; D71 disk image
+        ;; Set both the D64 and the D65 flags to mean "big D64" = D71 image
+        txa
+        tsb $d68a
+        tsb $d68b
+        bra @d81attach_typeset
 
 @not_d71:
-	cmp #65
-	bne @d81attach_typeset
+        cmp #65
+        bne @d81attach_typeset
 
         ;; D65 disk image
         ;; Set megadisk flag
-	txa
-	tsb $d68b
+        txa
+        tsb $d68b
 
 @d81attach_typeset:
         cpx #$80
@@ -4506,8 +4506,8 @@ dos_diskattach:
         sec
         rts
 
-	
-dos_d81check:	
+
+dos_d81check:
         ;; now we need to check that the file is long enough,
         ;; and also that the clusters are contiguous.
 
@@ -4592,9 +4592,9 @@ d81nextcluster:
 
 l94a:   lda dos_file_descriptors+dos_filedescriptor_offset_currentcluster,x
         cmp d81_clusternumber,y
-	beq not_a_frag
+        beq not_a_frag
         jmp d81isfragged
-not_a_frag:	
+not_a_frag:
         inx
         iny
         cpy #4
@@ -4640,23 +4640,23 @@ l96:
         ;; now check that it is the right length
 
         ;; that is to much!
-	lda d81_clustercount+2
-	ora d81_clustercount+3
-	bne d81wronglength
-
-	;; It might also be a D64 (1541) or D71 (1571) disk image,
-	;; so check for 683x256/4096 = 42.6875 = 43 clusters or
-	;; double that for D71
-	lda d81_clustercount+1
+        lda d81_clustercount+2
+        ora d81_clustercount+3
+        bne d81wronglength
+
+        ;; It might also be a D64 (1541) or D71 (1571) disk image,
+        ;; so check for 683x256/4096 = 42.6875 = 43 clusters or
+        ;; double that for D71
+        lda d81_clustercount+1
         cmp d64_clustersneeded+1
-	bne not_1541
-	lda d81_clustercount
-	cmp d64_clustersneeded
-	bne not_1541_2
+        bne not_1541
+        lda d81_clustercount
+        cmp d64_clustersneeded
+        bne not_1541_2
 
-	;;  IS a d64 sized file
+        ;;  IS a d64 sized file
         lda #64
-	bra d81_is_good
+        bra d81_is_good
 
 not_1541_2:
         lda d81_clustercount+1
@@ -4664,32 +4664,32 @@ not_1541:
         cmp d71_clustersneeded+1
         bne not_1571
         lda d81_clustercount
-	cmp d71_clustersneeded
-	bne not_1571_2
+        cmp d71_clustersneeded
+        bne not_1571_2
 
-	;; IS a d71 sized file
+        ;; IS a d71 sized file
         lda #71
-	bra d81_is_good
+        bra d81_is_good
 
 not_1571_2:
         lda d81_clustercount+1
 not_1571:
-	;; First check if we read enough for 85 tracks x 64 sectors x 2 sides = 5,570,560 bytes
-	;; = 1,360 clusters = $0550 clusters
-	;; XXX - This currently assumes 8 sectors per cluster = 4KB sectors
-	cmp #$05
-	bne not_mega_floppy
-	lda d81_clustercount
-	cmp #$50
-	bne not_mega_floppy_2
+        ;; First check if we read enough for 85 tracks x 64 sectors x 2 sides = 5,570,560 bytes
+        ;; = 1,360 clusters = $0550 clusters
+        ;; XXX - This currently assumes 8 sectors per cluster = 4KB sectors
+        cmp #$05
+        bne not_mega_floppy
+        lda d81_clustercount
+        cmp #$50
+        bne not_mega_floppy_2
 
         lda #65
         bra d81_is_good
 
 not_mega_floppy_2:
         lda d81_clustersneeded+1
-not_mega_floppy:	
-	;; D81 image?
+not_mega_floppy:
+        ;; D81 image?
         cmp d81_clustercount+1
         bne d81wronglength
         lda d81_clustersneeded
@@ -4717,9 +4717,9 @@ l94c:   lda dos_file_descriptors+dos_filedescriptor_offset_startcluster,x
 
         jsr dos_cluster_to_sector
 
-	sec
-	rts
-	
+        sec
+        rts
+
 
 ;;         ========================
 
diff --git a/src/hyppo/dos_write.asm b/src/hyppo/dos_write.asm
index 99b9de748..f023f1669 100644
--- a/src/hyppo/dos_write.asm
+++ b/src/hyppo/dos_write.asm
@@ -1,6 +1,6 @@
 ;; /*  -------------------------------------------------------------------
 ;;     MEGA65 "HYPPOBOOT" Combined boot and hypervisor ROM.
-;;     Paul Gardner-Stephen, 2014-2019.
+;;     Paul Gardner-Stephen, 2014-2024.
 
 ;;     Routines for writing to FAT file system.
 ;;     ---------------------------------------------------------------- */
diff --git a/src/hyppo/freeze.asm b/src/hyppo/freeze.asm
index 8ecaa542f..b1c875eab 100644
--- a/src/hyppo/freeze.asm
+++ b/src/hyppo/freeze.asm
@@ -1,6 +1,6 @@
 ;; /*  -------------------------------------------------------------------
 ;;     MEGA65 "HYPPOBOOT" Combined boot and hypervisor ROM.
-;;     Paul Gardner-Stephen, 2014-2019.
+;;     Paul Gardner-Stephen, 2014-2024.
 ;;     ---------------------------------------------------------------- */
 
 version_sentinel_str = "VRS"
diff --git a/src/hyppo/joyflash.asm b/src/hyppo/joyflash.asm
index c20994001..7a1ca2546 100644
--- a/src/hyppo/joyflash.asm
+++ b/src/hyppo/joyflash.asm
@@ -1,6 +1,6 @@
   ;; -------------------------------------------------------------------
   ;;   MEGA65 "HYPPOBOOT" Combined boot and hypervisor ROM.
-  ;;   Paul Gardner-Stephen, 2014-2019.
+  ;;   Paul Gardner-Stephen, 2014-2024.
   ;;   -------------------------------------------------------------------
   ;;   Purpose:
   ;;   1. Verify checksum of ROM area of slow RAM.
@@ -41,7 +41,7 @@
 !addr Hyppo_End                    = $bfff
 
 ;; .file [name="../../bin/HICKUP.M65", type="bin", segments="TrapEntryPoints,RelocatedCPUVectors,Traps,DOSDiskTable,SysPartStructure,DOSWorkArea,ProcessDescriptors,HyppoStack,HyppoZP"]
-	!to "bin/BRICKUP.M65", plain
+        !to "bin/BRICKUP.M65", plain
 
 ;; .segmentdef TrapEntryPoints        [min=TrapEntryPoints_Start,     max=RelocatedCPUVectors_Start-1                         ]
 ;; .segmentdef RelocatedCPUVectors    [min=RelocatedCPUVectors_Start, max=Traps_Start-1                                       ]
@@ -217,7 +217,7 @@ trap_entry_points:
         eom
         jmp nosuchtrap
         eom
-	;; Writing to $D67F shall trap to freezer, as though user had triggered it.
+        ;; Writing to $D67F shall trap to freezer, as though user had triggered it.
         jmp restore_press_trap
         eom
 
@@ -243,8 +243,8 @@ trap_entry_points:
         jmp unstable_illegal_opcode_trap        ;; Trap #$46 (6502 unstable illegal opcode)
         eom
         jmp kill_opcode_trap                    ;; Trap #$47 (6502 KIL instruction)
-        eom	
-        jmp ethernet_remote_trap                ;; Trap #$48 (Ethernet remote control trap) 
+        eom
+        jmp ethernet_remote_trap                ;; Trap #$48 (Ethernet remote control trap)
         eom
         jmp nosuchtrap
         eom
@@ -295,8 +295,8 @@ trap_entry_points:
 ;;     to return?)
 ;;     ---------------------------------------------------------------- */
 emulatortrap:
-	;; FALL-THROUGH -- return failure on real hardware
-	;; Xemu will intercept it itself
+        ;; FALL-THROUGH -- return failure on real hardware
+        ;; Xemu will intercept it itself
 nosuchtrap:
 
         ;; Clear C flag for caller to indicate failure
@@ -338,7 +338,7 @@ return_from_trap_with_success:
 
         +Checkpoint "return_from_trap_with_success"
 
-	;; DO NOT Clear A on return
+        ;; DO NOT Clear A on return
         ;; (else traps can't return anything in A register)
 
         ;; return from hypervisor
@@ -450,22 +450,22 @@ reset_machine_state:
         lda #$6b    ;; 01101011
         sta hypervisor_feature_enables
 
-	;; Reset ethernet to clear any queued packets from before reset
-	;; and ack 1 packet to get the controller into the right state
-	lda #$00
-	sta $d6e0
-	lda #$03
-	sta $d6e0
-	sta $d6e1
-	lda #$00
-	sta $d6e1
-	
-	
-	;; Enable cartridge /EXROM and /GAME lines in CPU addressing
-	lda #$02
-	tsb $d7fb
-
-	;; /EXROM and /GAME follow cartridge port
+        ;; Reset ethernet to clear any queued packets from before reset
+        ;; and ack 1 packet to get the controller into the right state
+        lda #$00
+        sta $d6e0
+        lda #$03
+        sta $d6e0
+        sta $d6e1
+        lda #$00
+        sta $d6e1
+
+
+        ;; Enable cartridge /EXROM and /GAME lines in CPU addressing
+        lda #$02
+        tsb $d7fb
+
+        ;; /EXROM and /GAME follow cartridge port
         lda #$3f
         sta $d7fd
 
@@ -475,16 +475,16 @@ reset_machine_state:
         sta audioamp_ctl
 
         ;; Return keyboard LEDs to automatic control
-	lda #$00
-	sta $d61d
-	;; Disable VIC-IV debug modes
-	sta $d066
+        lda #$00
+        sta $d61d
+        ;; Disable VIC-IV debug modes
+        sta $d066
         ;; Clear system partition present flag
         sta syspart_present
         ;; disable IRQ/NMI sources
         sta $D01A
         lda #$7f
-	sta $d07f   		; Hide VIC-IV cross-hairs
+        sta $d07f                   ; Hide VIC-IV cross-hairs
         sta $DC0D
         sta $DD0D
 
@@ -493,7 +493,7 @@ reset_machine_state:
 
         ;; switch to fast mode
         ;; 1. C65 fast-mode enable, and disable extended attributes
-	lda #$40
+        lda #$40
         sta $d031
         ;; 2. MEGA65 48MHz enable (requires C65 or C128 fast mode to truly enable, hence the above)
         lda #$c5
@@ -505,19 +505,19 @@ reset_machine_state:
         ;; sprites off, and normal mode, 256-colour char data from chipram
         lda #$00
         sta $d015
-	sta $d063
+        sta $d063
         sta $d055
         sta $d06b
         sta $d057
         lda #$f0
-	tax
-	trb $d049
-	txa
-	trb $d04b
-	txa
-	trb $d04d
-	txa
-	trb $d04f
+        tax
+        trb $d049
+        txa
+        trb $d04b
+        txa
+        trb $d04d
+        txa
+        trb $d04f
 
         ;; We DO NOT need to mess with $01, because
         ;; the 4510 starts up with hyppo mapped at $8000-$BFFF
@@ -553,26 +553,26 @@ reset_machine_state:
 reset_entry:
         sei
 
- 	;; Put ZP and stack back where they belong
-	lda #$bf
-	tab
-	ldy #$be
-	tys
-	ldx #$ff
-	txs
-
-	;; Clear mapping of lower memory area
-	ldx #$00
-	lda #$00
-	ldy #$00
-	ldz #$3f
-	map
-	eom
+         ;; Put ZP and stack back where they belong
+        lda #$bf
+        tab
+        ldy #$be
+        tys
+        ldx #$ff
+        txs
+
+        ;; Clear mapping of lower memory area
+        ldx #$00
+        lda #$00
+        ldy #$00
+        ldz #$3f
+        map
+        eom
 
         jsr reset_machine_state
 
-	;; If banner is in flash, load it _immediately_
-	jsr tryloadbootlogofromflash
+        ;; If banner is in flash, load it _immediately_
+        jsr tryloadbootlogofromflash
 
         ;; display welcome screen
         ;;
@@ -592,7 +592,7 @@ reset_entry:
         ldy #>msg_gitcommit
         jsr printmessage
 
-	jsr resetdisplay
+        jsr resetdisplay
 
         ;; Try to read the MBR from the SD card to ensure SD card is happy
         ;;
@@ -603,7 +603,7 @@ reset_entry:
         ;; Work out if we are using primary or secondard SD card
 
         ;; First try resetting card 1 (external)
-	;; so that if you have an external card, it will be used in preference
+        ;; so that if you have an external card, it will be used in preference
         lda #$c1
         sta $d680
         lda #$00
@@ -652,13 +652,13 @@ trybus0:
         beq tryreadmbr
 
         ;; No working SD card -- This is a fatal error for this mode of operation,
-	;; as the whole point is we need to load and start JOYFLASH.M65
+        ;; as the whole point is we need to load and start JOYFLASH.M65
 
         ldx #<msg_nosdcard
         ldy #>msg_nosdcard
         jsr printmessage
-nosd:	inc $d020
-	jmp nosd
+nosd:        inc $d020
+        jmp nosd
 
 tryreadmbr:
         jsr readmbr
@@ -713,27 +713,27 @@ gotmbr:
 loadbannerfromsd:
         ;; Load and display boot logo
 
-	jsr setup_banner_load_pointer
+        jsr setup_banner_load_pointer
 
         ldx #<txt_JOYFLASHM65
         ldy #>txt_JOYFLASHM65
         jsr dos_setname
 
-	lda #<$07FF
+        lda #<$07FF
         sta <dos_file_loadaddress
-	lda #>$07FF
+        lda #>$07FF
         sta <(dos_file_loadaddress+1)
-	lda #$00
+        lda #$00
         sta <(dos_file_loadaddress+2)
         sta <(dos_file_loadaddress+3)
-	
+
         ;; print debug message
         ;;
         +Checkpoint "  try-loading JOYFLASH.M65"
 
         jsr dos_readfileintomemory
         bcs joyflashok
-	
+
 ;;         ========================
 
         ;; FAILED: print debug message
@@ -749,15 +749,15 @@ loadbannerfromsd:
         ldz dos_error_code
         jsr printhex
 
-nojoy:	inc $d020
-	jmp nojoy
-	
+nojoy:        inc $d020
+        jmp nojoy
+
         +Checkpoint "FAILED loading BOOTLOGO"
 
 ;;         ========================
 
 joyflashok:
-	jmp run_util_in_hypervisor_context
+        jmp run_util_in_hypervisor_context
 
 ;;         ========================
 
@@ -823,12 +823,12 @@ resetdisplay:
         lda #$00        ;; black
         sta $D020       ;; border
         sta $D021       ;; background
-	sta $D711 	;; Disable DMA audio
+        sta $D711         ;; Disable DMA audio
 
         ;; Start in 60Hz mode, since most monitors support it
         ;; (Also required to make sure matrix mode pixels aren't ragged on first boot).
-	;; The label here is used so that the syspartition settings can be used to
-	;; change the default video mode on reset.
+        ;; The label here is used so that the syspartition settings can be used to
+        ;; change the default video mode on reset.
 pal_ntsc_minus_1:
         lda #$80
         sta $d06f
@@ -868,7 +868,7 @@ pal_ntsc_minus_1:
 
         ;; Now switch to 16-bit text mode so that we can use proportional
         ;; characters and full-colour characters for chars >$FF for the logo
-	;; Also enable CRT emulation by default.
+        ;; Also enable CRT emulation by default.
         ;;
         lda #$e5
         sta $d054        ;; VIC-IV Control Register C
@@ -892,11 +892,11 @@ resetpalette:
         lda #$04
         tsb $D030        ;; enable PAL bit in $D030
 
-	jsr setbannerpalette
+        jsr setbannerpalette
 
         ;; C64 colours designed to look like C65 colours on an
         ;; RGBI screen.
-	ldx #$0F
+        ldx #$0F
 -       lda c64_colours_table+$00,x     ; load & store red component
         sta $D100,x
         lda c64_colours_table+$10,x     ; load & store green component
@@ -906,13 +906,13 @@ resetpalette:
         dex
         bpl -
 
-	rts
-	
+        rts
+
 c64_colours_table:
         ;   0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | A | B | C | D | E | F
         !8 $00,$ff,$ba,$66,$bb,$55,$d1,$ae,$9b,$87,$dd,$b5,$b8,$0b,$aa,$8b  ; -- red
         !8 $00,$ff,$13,$ad,$f3,$ec,$e0,$5f,$47,$37,$39,$b5,$b8,$4f,$d9,$8b  ; -- green
-        !8 $00,$ff,$62,$ff,$8b,$85,$79,$c7,$81,$00,$78,$b5,$b8,$ca,$fe,$8b  ; -- blue	
+        !8 $00,$ff,$62,$ff,$8b,$85,$79,$c7,$81,$00,$78,$b5,$b8,$ca,$fe,$8b  ; -- blue
 
 ;;         ========================
 
@@ -1021,7 +1021,7 @@ setbannerpalette:
         lda #$ff
         sta $D070        ;; select palette bank 3 for display and edit
 
-	;; Set DMA list address
+        ;; Set DMA list address
         ;;
         lda #>bannerpalettedmalist
         sta $d701
@@ -1120,14 +1120,14 @@ pm22:
         cpx #25
         bne pm2
 
-	jsr scroll_screen
-	ldx #24
-	stx screenrow
+        jsr scroll_screen
+        ldx #24
+        stx screenrow
 
         ;; work out the screen address
         ;;
 pm2:
-	cpx #$00
+        cpx #$00
         beq pm1
 
         clc
@@ -1182,13 +1182,13 @@ endofmessage:
         inc screenrow
 
 !if DEBUG_HYPPO {
-	;; XXX DEBUG
-	;; Require key press after each line displayed.
-;;	jsr debug_wait_on_key
+        ;; XXX DEBUG
+        ;; Require key press after each line displayed.
+;;        jsr debug_wait_on_key
 }
 
-	plz
-	rts
+        plz
+        rts
 
 printbanner:
         stx <zptempp
@@ -1681,117 +1681,117 @@ cpnth1: adc #$06
 
 
 safe_video_mode:
-	;; No digital audio, just pure DVI
-	lda #$02
-	sta $d61a
-	;; NTSC
-	lda #$80
-	sta $d06f
-	rts
+        ;; No digital audio, just pure DVI
+        lda #$02
+        sta $d61a
+        ;; NTSC
+        lda #$80
+        sta $d06f
+        rts
 
 run_util_in_hypervisor_context:
-	;; XXX Move Stack and ZP to normal places, before letting C64 KERNAL loose on
-	;; Hypervisor memory map!
-	lda #$00
-	!8 $5B ;; tab
-	ldy #$01
-	!8 $2B ;; tys
-
-	jsr setup_for_openrom
-	;; XXX Work around bug in OpenROMs that erases our banner palette when we do this
-	;; by putting the palette back immediately.
+        ;; XXX Move Stack and ZP to normal places, before letting C64 KERNAL loose on
+        ;; Hypervisor memory map!
+        lda #$00
+        !8 $5B ;; tab
+        ldy #$01
+        !8 $2B ;; tys
+
+        jsr setup_for_openrom
+        ;; XXX Work around bug in OpenROMs that erases our banner palette when we do this
+        ;; by putting the palette back immediately.
         jsr setbannerpalette
 
-	;; Actually launch the utility in the hypervisor context
-	;; (so must not use RAM > $7FFF, is immune to freezing etc)
-	jmp $080d
+        ;; Actually launch the utility in the hypervisor context
+        ;; (so must not use RAM > $7FFF, is immune to freezing etc)
+        jmp $080d
 
 setup_for_openrom:
 
-	;; Bank in KERNAL ROM space so megaflash can run
-	;; Writing to $01 when ZP is relocated is a bit tricky, as
-	;; we have to mess about with the Base Register, or force
-	;; the assembler to do an absolute write.
-	lda #$37
-	!8 $8d,$01,$00 ;; ABS STA $0001
-
-	;; We should also reset video mode to normal
-	lda #$97
-	trb $d054
-
-	;; Clear memory map at $4000-5FFF
-	;; (Why on earth do we even map some of the HyperRAM there, anyway???)
-	lda #0
-	tax
-	tay
-	ldz #$3f
-	map
-	eom
-	;; And set MB low to $00, so that OpenROM doesn't jump into lala land
-	lda #0
-	ldx #$0f
-	map
-	eom
-
-	;; Tell KERNAL screen is at $0400
-	lda #>$0400
-	sta $0288
-
-	lda $fff9
-	cmp #$ff
-	beq @notOpenROM
-	;; OpenROMs setup (XXX Won't work with Commodore C65 ROMs!)
-	jsr ($fff8)
+        ;; Bank in KERNAL ROM space so megaflash can run
+        ;; Writing to $01 when ZP is relocated is a bit tricky, as
+        ;; we have to mess about with the Base Register, or force
+        ;; the assembler to do an absolute write.
+        lda #$37
+        !8 $8d,$01,$00 ;; ABS STA $0001
+
+        ;; We should also reset video mode to normal
+        lda #$97
+        trb $d054
+
+        ;; Clear memory map at $4000-5FFF
+        ;; (Why on earth do we even map some of the HyperRAM there, anyway???)
+        lda #0
+        tax
+        tay
+        ldz #$3f
+        map
+        eom
+        ;; And set MB low to $00, so that OpenROM doesn't jump into lala land
+        lda #0
+        ldx #$0f
+        map
+        eom
+
+        ;; Tell KERNAL screen is at $0400
+        lda #>$0400
+        sta $0288
+
+        lda $fff9
+        cmp #$ff
+        beq @notOpenROM
+        ;; OpenROMs setup (XXX Won't work with Commodore C65 ROMs!)
+        jsr ($fff8)
 @notOpenROM:
-	;; make sure not in quote mode etc
-	lda #$00
-	sta $d8 ;; number of insertions outstanding = 0
-	sta $0f ;; clear quote mode
-
-	;; Clear common interrupt sources
-
-	;; CIAs
-;;	lda #$ff
-;;	sta $dc0d
-;;	sta $dd0d
-;;	lda $dc0d
-;;	lda $dd0d
-
-	;; VIC-IV
-;;	dec $d019
-;;	lda #$00
-;;	sta $d01a
-
-	;; Ethernet
-;;	lda #$00
-;;	sta $d6e1
-
-	;; C65 UART
-	;; XXX Actually it can't generate interrupts yet, so nothing to do :)
-
-	;; Finally, clear any pending interrupts by using MAP instruction
-;;	tax
-;;	tay
-;;	taz
-;;	map
-;;	lda #0    ;; to give time to effect clearing irq_pending in CPU
-;;	eom
-
-	;; And ignore any queued NMI (these don't get cleared by the MAP trick)
-
-	;;  Clear pending NMI flag
+        ;; make sure not in quote mode etc
+        lda #$00
+        sta $d8 ;; number of insertions outstanding = 0
+        sta $0f ;; clear quote mode
+
+        ;; Clear common interrupt sources
+
+        ;; CIAs
+;;        lda #$ff
+;;        sta $dc0d
+;;        sta $dd0d
+;;        lda $dc0d
+;;        lda $dd0d
+
+        ;; VIC-IV
+;;        dec $d019
+;;        lda #$00
+;;        sta $d01a
+
+        ;; Ethernet
+;;        lda #$00
+;;        sta $d6e1
+
+        ;; C65 UART
+        ;; XXX Actually it can't generate interrupts yet, so nothing to do :)
+
+        ;; Finally, clear any pending interrupts by using MAP instruction
+;;        tax
+;;        tay
+;;        taz
+;;        map
+;;        lda #0    ;; to give time to effect clearing irq_pending in CPU
+;;        eom
+
+        ;; And ignore any queued NMI (these don't get cleared by the MAP trick)
+
+        ;;  Clear pending NMI flag
         lda hypervisor_feature_enables
-	and #$7f
+        and #$7f
         sta hypervisor_feature_enables
 
-	;; Set safety-net NMI handler
-	lda #$40
-	sta $0420
-	lda #<$0420
-	sta $0318
-	lda #>$0420
-	sta $0319
-	rts
+        ;; Set safety-net NMI handler
+        lda #$40
+        sta $0420
+        lda #<$0420
+        sta $0318
+        lda #>$0420
+        sta $0319
+        rts
 
 screenrestore_dmalist:
         !8 $80,$00  ;; Copy from $00xxxxx
@@ -1812,7 +1812,7 @@ scroll_screen:
         sta $d702
         sta $d704  ;; dma list is in top MB of address space
 
-	;; Don't forget to reset colour RAM also
+        ;; Don't forget to reset colour RAM also
         lda #>scrollscreen_dmalist
         sta $d701
         ;; set bottom 8 bits of address and trigger DMA.
@@ -1820,7 +1820,7 @@ scroll_screen:
         lda #<scrollscreen_dmalist
         sta $d705
 
-	rts
+        rts
 
 scrollscreen_dmalist:
         !8 $80,$00  ;; Copy from $00xxxxx
@@ -1916,17 +1916,17 @@ ulvc_fail:
         rts
 
 tryloadbootlogofromflash:
-	rts
+        rts
 setup_banner_load_pointer:
-	rts
+        rts
 attempt_loadcharrom:
-	rts
+        rts
 attempt_loadc65rom:
-	rts
+        rts
 first_boot_flag_instruction:
-	inc $d020
-	rts
-	
+        inc $d020
+        rts
+
 utillist_rewind:
 
         ;; Set pointer to first entry in colour RAM ($0850)
@@ -1944,9 +1944,9 @@ utillist_rewind:
 serialwrite:
         ;; write character to serial port
 
-	;; First wait for it to go ready
-	ldx hypervisor_write_char_to_serial_monitor
-	bne serialwrite
+        ;; First wait for it to go ready
+        ldx hypervisor_write_char_to_serial_monitor
+        bne serialwrite
 
         ;; XXX - Have some kind of permission control on this
         ;; XXX - $D67C should not work when matrix mode is enabled at all?
@@ -1982,12 +1982,12 @@ msg_utilitymenu:
         !8 0
 
 msg_noutilitymenu:
-		        !text "HOLD ALT + POWER CYCLE FOR UTILITY MENU"
-	                !8 0
+                        !text "HOLD ALT + POWER CYCLE FOR UTILITY MENU"
+                        !8 0
 
 msg_noflashmenu:
-		        !text "HOLD NO SCROLL + POWER CYCLE FOR FLASH"
-	                !8 0
+                        !text "HOLD NO SCROLL + POWER CYCLE FOR FLASH"
+                        !8 0
 
 msg_retryreadmbr:       !text "RE-TRYING TO READ MBR"
                         !8 0
@@ -2124,9 +2124,9 @@ txt_BOOTLOGOM65:        !text "BANNER.M65"
 txt_FREEZER:            !text "FREEZER.M65"
                         !8 0
 
-txt_ETHLOAD:		!text "ETHLOAD.M65"
-			!8 0
-	
+txt_ETHLOAD:                !text "ETHLOAD.M65"
+                        !8 0
+
             ;; If this file is present, then machine starts up with video
             ;; mode set to NTSC (60Hz), else as PAL (50Hz).
             ;; This is to allow us to boot in PAL by default, except for
@@ -2136,7 +2136,7 @@ txt_NTSC:               !text "NTSC"
 
 txt_JOYFLASHM65:          !text "JOYFLASH.M65"
                         !8 0,0
-	
+
 ;;         ========================
 
 !if DEBUG_HYPPO {
@@ -2258,7 +2258,7 @@ dos_direntstart_sectorincluster:
         !8 0
 dos_direntstart_offsetinsector:
         !8 0,0
-        
+
 ;;         ========================
 
         ;; WARNING: dos_readdir_read_next_entry uses carnal knowledge about the following
@@ -2471,6 +2471,6 @@ d71_clustersneeded:
 d81_clustercount:
         !16 0
 
-	;; Make sure we pad to full size
-	* = Hyppo_End
-	!8 0
+        ;; Make sure we pad to full size
+        * = Hyppo_End
+        !8 0
diff --git a/src/hyppo/keyboard.asm b/src/hyppo/keyboard.asm
index 743c6f3c2..100606b2d 100644
--- a/src/hyppo/keyboard.asm
+++ b/src/hyppo/keyboard.asm
@@ -1,6 +1,6 @@
 ;; /*  -------------------------------------------------------------------
 ;;     MEGA65 "HYPPOBOOT" Combined boot and hypervisor ROM.
-;;     Paul Gardner-Stephen, 2014-2019.
+;;     Paul Gardner-Stephen, 2014-2024.
 ;;     ---------------------------------------------------------------- */
 
 ;; peek first key in accelerated key buffer, without removing it
diff --git a/src/hyppo/machine.asm b/src/hyppo/machine.asm
index 9afb8bf75..3dd23c147 100644
--- a/src/hyppo/machine.asm
+++ b/src/hyppo/machine.asm
@@ -1,6 +1,6 @@
 ;; /*  -------------------------------------------------------------------
 ;;     MEGA65 "HYPPOBOOT" Combined boot and hypervisor ROM.
-;;     Paul Gardner-Stephen, 2014-2019.
+;;     Paul Gardner-Stephen, 2014-2024.
 ;;     ---------------------------------------------------------------- */
 
 !addr reset_vector = $fffc
diff --git a/src/hyppo/macros.asm b/src/hyppo/macros.asm
index e5de554c5..ba34c1068 100644
--- a/src/hyppo/macros.asm
+++ b/src/hyppo/macros.asm
@@ -1,6 +1,6 @@
 ;; /*  -------------------------------------------------------------------
 ;;     MEGA65 "HYPPOBOOT" Combined boot and hypervisor ROM.
-;;     Paul Gardner-Stephen, 2014-2019.
+;;     Paul Gardner-Stephen, 2014-2024.
 ;;     ---------------------------------------------------------------- */
 
 
diff --git a/src/hyppo/main.asm b/src/hyppo/main.asm
index f9a467c61..b5443cee3 100644
--- a/src/hyppo/main.asm
+++ b/src/hyppo/main.asm
@@ -1,6 +1,6 @@
   ;; -------------------------------------------------------------------
   ;;   MEGA65 "HYPPOBOOT" Combined boot and hypervisor ROM.
-  ;;   Paul Gardner-Stephen, 2014-2019.
+  ;;   Paul Gardner-Stephen, 2014-2024.
   ;;   -------------------------------------------------------------------
   ;;   Purpose:
   ;;   1. Verify checksum of ROM area of slow RAM.
@@ -41,7 +41,7 @@
 !addr Hyppo_End                    = $bfff
 
 ;; .file [name="../../bin/HICKUP.M65", type="bin", segments="TrapEntryPoints,RelocatedCPUVectors,Traps,DOSDiskTable,SysPartStructure,DOSWorkArea,ProcessDescriptors,HyppoStack,HyppoZP"]
-	!to "bin/HICKUP.M65", plain
+        !to "bin/HICKUP.M65", plain
 
 ;; .segmentdef TrapEntryPoints        [min=TrapEntryPoints_Start,     max=RelocatedCPUVectors_Start-1                         ]
 ;; .segmentdef RelocatedCPUVectors    [min=RelocatedCPUVectors_Start, max=Traps_Start-1                                       ]
@@ -217,7 +217,7 @@ trap_entry_points:
         eom
         jmp nosuchtrap
         eom
-	;; Writing to $D67F shall trap to freezer, as though user had triggered it.
+        ;; Writing to $D67F shall trap to freezer, as though user had triggered it.
         jmp restore_press_trap
         eom
 
@@ -243,8 +243,8 @@ trap_entry_points:
         jmp unstable_illegal_opcode_trap        ;; Trap #$46 (6502 unstable illegal opcode)
         eom
         jmp kill_opcode_trap                    ;; Trap #$47 (6502 KIL instruction)
-        eom	
-        jmp ethernet_remote_trap                ;; Trap #$48 (Ethernet remote control trap) 
+        eom
+        jmp ethernet_remote_trap                ;; Trap #$48 (Ethernet remote control trap)
         eom
         jmp nosuchtrap
         eom
@@ -295,8 +295,8 @@ trap_entry_points:
 ;;     to return?)
 ;;     ---------------------------------------------------------------- */
 emulatortrap:
-	;; FALL-THROUGH -- return failure on real hardware
-	;; Xemu will intercept it itself
+        ;; FALL-THROUGH -- return failure on real hardware
+        ;; Xemu will intercept it itself
 nosuchtrap:
 
         ;; Clear C flag for caller to indicate failure
@@ -338,7 +338,7 @@ return_from_trap_with_success:
 
         +Checkpoint "return_from_trap_with_success"
 
-	;; DO NOT Clear A on return
+        ;; DO NOT Clear A on return
         ;; (else traps can't return anything in A register)
 
         ;; return from hypervisor
@@ -450,22 +450,22 @@ reset_machine_state:
         lda #$6b    ;; 01101011
         sta hypervisor_feature_enables
 
-	;; Reset ethernet to clear any queued packets from before reset
-	;; and ack 1 packet to get the controller into the right state
-	lda #$00
-	sta $d6e0
-	lda #$03
-	sta $d6e0
-	sta $d6e1
-	lda #$00
-	sta $d6e1
-	
-	
-	;; Enable cartridge /EXROM and /GAME lines in CPU addressing
-	lda #$02
-	tsb $d7fb
-
-	;; /EXROM and /GAME follow cartridge port
+        ;; Reset ethernet to clear any queued packets from before reset
+        ;; and ack 1 packet to get the controller into the right state
+        lda #$00
+        sta $d6e0
+        lda #$03
+        sta $d6e0
+        sta $d6e1
+        lda #$00
+        sta $d6e1
+
+
+        ;; Enable cartridge /EXROM and /GAME lines in CPU addressing
+        lda #$02
+        tsb $d7fb
+
+        ;; /EXROM and /GAME follow cartridge port
         lda #$3f
         sta $d7fd
 
@@ -475,16 +475,16 @@ reset_machine_state:
         sta audioamp_ctl
 
         ;; Return keyboard LEDs to automatic control
-	lda #$00
-	sta $d61d
-	;; Disable VIC-IV debug modes
-	sta $d066
+        lda #$00
+        sta $d61d
+        ;; Disable VIC-IV debug modes
+        sta $d066
         ;; Clear system partition present flag
         sta syspart_present
         ;; disable IRQ/NMI sources
         sta $D01A
         lda #$7f
-	sta $d07f   		; Hide VIC-IV cross-hairs
+        sta $d07f                   ; Hide VIC-IV cross-hairs
         sta $DC0D
         sta $DD0D
 
@@ -493,7 +493,7 @@ reset_machine_state:
 
         ;; switch to fast mode
         ;; 1. C65 fast-mode enable, and disable extended attributes
-	lda #$40
+        lda #$40
         sta $d031
         ;; 2. MEGA65 48MHz enable (requires C65 or C128 fast mode to truly enable, hence the above)
         lda #$c5
@@ -505,19 +505,19 @@ reset_machine_state:
         ;; sprites off, and normal mode, 256-colour char data from chipram
         lda #$00
         sta $d015
-	sta $d063
+        sta $d063
         sta $d055
         sta $d06b
         sta $d057
         lda #$f0
-	tax
-	trb $d049
-	txa
-	trb $d04b
-	txa
-	trb $d04d
-	txa
-	trb $d04f
+        tax
+        trb $d049
+        txa
+        trb $d04b
+        txa
+        trb $d04d
+        txa
+        trb $d04f
 
         ;; We DO NOT need to mess with $01, because
         ;; the 4510 starts up with hyppo mapped at $8000-$BFFF
@@ -553,21 +553,21 @@ reset_machine_state:
 reset_entry:
         sei
 
- 	;; Put ZP and stack back where they belong
-	lda #$bf
-	tab
-	ldy #$be
-	tys
-	ldx #$ff
-	txs
-
-	;; Clear mapping of lower memory area
-	ldx #$00
-	lda #$00
-	ldy #$00
-	ldz #$3f
-	map
-	eom
+         ;; Put ZP and stack back where they belong
+        lda #$bf
+        tab
+        ldy #$be
+        tys
+        ldx #$ff
+        txs
+
+        ;; Clear mapping of lower memory area
+        ldx #$00
+        lda #$00
+        ldy #$00
+        ldz #$3f
+        map
+        eom
 
 !if DEBUG_HYPPO {
         !src "debugtests.asm"
@@ -575,8 +575,8 @@ reset_entry:
 
         jsr reset_machine_state
 
-	;; If banner is in flash, load it _immediately_
-	jsr tryloadbootlogofromflash
+        ;; If banner is in flash, load it _immediately_
+        jsr tryloadbootlogofromflash
 
         ;; display welcome screen
         ;;
@@ -603,114 +603,114 @@ reset_entry:
         bit $1234
 
         ;; Display help text
-	lda first_boot_flag_instruction
-	cmp #$4c
-	beq not_first_boot_message
+        lda first_boot_flag_instruction
+        cmp #$4c
+        beq not_first_boot_message
         ldx #<msg_hyppohelpfirst
         ldy #>msg_hyppohelpfirst
         jsr printmessage
-	jmp first_boot_flag_instruction
+        jmp first_boot_flag_instruction
 
 not_first_boot_message:
         ldx #<msg_hyppohelpnotfirst
         ldy #>msg_hyppohelpnotfirst
         jsr printmessage
 
-	;; Work out if we are on first reset.  If so, then try switching to bitstream in 2nd slot.
+        ;; Work out if we are on first reset.  If so, then try switching to bitstream in 2nd slot.
 
 try_flash_menu:
-	;; Use first boot code path only once
-	;; WARNING: Self modifying code!
+        ;; Use first boot code path only once
+        ;; WARNING: Self modifying code!
 first_boot_flag_instruction:
-	bit dont_launch_flash_menu
+        bit dont_launch_flash_menu
 
-	;; On first boot, we start the flash menu regardless
-	;; (The flash menu will work out whether to switch bitstream or not)
+        ;; On first boot, we start the flash menu regardless
+        ;; (The flash menu will work out whether to switch bitstream or not)
 
 launch_flash_menu:
 
-	;; Disable digital audio when launching flash menu
-	jsr safe_video_mode
+        ;; Disable digital audio when launching flash menu
+        jsr safe_video_mode
 
-	;; Disable cartridge, the flash menu does not run with cart enabled!
-	lda #$02
-	trb $d7fb
+        ;; Disable cartridge, the flash menu does not run with cart enabled!
+        lda #$02
+        trb $d7fb
 
-	;; Store where the flash menu should jump to if it doesn't need to do anything.
-	lda #<return_from_flashmenu
-	sta $cf80
-	lda #>return_from_flashmenu
-	sta $cf81
-	;; Then actually start it.
-	;; NOTE: Flash menu runs in hypervisor mode, so can't use memory beyond $7FFF etc.
-	;; (and is immune to attempts to freeze it)
+        ;; Store where the flash menu should jump to if it doesn't need to do anything.
+        lda #<return_from_flashmenu
+        sta $cf80
+        lda #>return_from_flashmenu
+        sta $cf81
+        ;; Then actually start it.
+        ;; NOTE: Flash menu runs in hypervisor mode, so can't use memory beyond $7FFF etc.
+        ;; (and is immune to attempts to freeze it)
 
-	jmp flash_menu
+        jmp flash_menu
 
 return_from_flashmenu:
 
-	;; Here we have been given control back from the flash menu program.
-	;; So we have to put some things back to continue the kickstart boot process.
+        ;; Here we have been given control back from the flash menu program.
+        ;; So we have to put some things back to continue the kickstart boot process.
 
-	;; Put ZP and stack back where they belong
-	lda #$bf
-	tab
-	ldy #$be
-	tys
-	ldx #$ff
-	txs
+        ;; Put ZP and stack back where they belong
+        lda #$bf
+        tab
+        ldy #$be
+        tys
+        ldx #$ff
+        txs
 
         lda #$ff
         sta $d702
         lda #$ff
         sta $d704  ;; dma list is in top MB of address space
 
-	;; Don't forget to reset colour RAM also
-	lda #$01
-	tsb $d030
+        ;; Don't forget to reset colour RAM also
+        lda #$01
+        tsb $d030
         lda #>erasescreendmalist
         sta $d701
         ;; set bottom 8 bits of address and trigger DMA.
         ;;
         lda #<erasescreendmalist
         sta $d705
-	lda #$01
-	trb $d030
+        lda #$01
+        trb $d030
 
-	;; And finally, the screen data
+        ;; And finally, the screen data
         lda #>screenrestore_dmalist
         sta $d701
         ;; Trigger enhanced DMA
         lda #<screenrestore_dmalist
         sta $d705
 
-	jsr resetdisplay
+        jsr resetdisplay
 
-	jmp dont_launch_flash_menu
+        jmp dont_launch_flash_menu
 
 dont_launch_flash_menu:
-	lda ascii_key_in
-	cmp #$09
-	beq noflash_menu
+        lda ascii_key_in
+        cmp #$09
+        beq noflash_menu
         lda buckykey_status
         and #$20
         beq fpga_has_been_reconfigured
 
-	;; Tell user what to do if they can't access the flash menu
+        ;; Tell user what to do if they can't access the flash menu
 noflash_menu:
         ldx #<msg_noflashmenu
         ldy #>msg_noflashmenu
         jsr printmessage
-	inc $d020
+        inc $d020
 nfm1:
-	jmp nfm1
+        jmp nfm1
 
 
 fpga_has_been_reconfigured:
 
-	;; We can't trust that the flash menu is still in memory by this point, so do nothing.
-	;; (This also means if you choose "safe mode" factory bitstream, and then reset, it
-	;; won't try to run upgraded bitstream again.)
+        ;; We can't trust that the flash menu is still in memory by this point, so do nothing.
+        ;; (This also means if you choose "safe mode" factory bitstream, and then reset, it
+        ;; won't try to run upgraded bitstream again.)
 
         ;; wait 0.1 msec for things to settle after power-up
         jsr sdwaitawhile
@@ -766,7 +766,7 @@ normalboot:
         ;; Work out if we are using primary or secondard SD card
 
         ;; First try resetting card 1 (external)
-	;; so that if you have an external card, it will be used in preference
+        ;; so that if you have an external card, it will be used in preference
         lda #$c1
         sta $d680
         lda #$00
@@ -902,7 +902,7 @@ mountsystemdiskok:
 loadbannerfromsd:
         ;; Load and display boot logo
 
-	jsr setup_banner_load_pointer
+        jsr setup_banner_load_pointer
 
         ldx #<txt_BOOTLOGOM65
         ldy #>txt_BOOTLOGOM65
@@ -1126,18 +1126,18 @@ f011Virtualised:
 
         ;; Go to root directory on default disk
         ;;
-	jsr cdroot_and_complain_if_fails
+        jsr cdroot_and_complain_if_fails
 
         ;; Re-set virtual screen row length after touching $D06F
         lda #80
         sta $d058
 
-	;; Check internal drive / SD card status, and don't mount D81 if set to use internal drive
-	;; Not only would this be a waste of time, it also stomps the $D6A1 bit 0 that indicates
-	;; to use the internal drive.
-	lda $d6a1
-	and #$01
-	bne @dontMountD81
+        ;; Check internal drive / SD card status, and don't mount D81 if set to use internal drive
+        ;; Not only would this be a waste of time, it also stomps the $D6A1 bit 0 that indicates
+        ;; to use the internal drive.
+        lda $d6a1
+        and #$01
+        bne @dontMountD81
 
         ;; set name of file we are looking for
         ;;
@@ -1185,68 +1185,68 @@ d81attachfail:
         ;; debug
         +Checkpoint "couldnt mount/attach MEGA65.D81"
 
-	jmp loadrom
+        jmp loadrom
 
 ;;         ========================
 
 tryloadbootlogofromflash:
 
-	jsr setup_banner_load_pointer
-	jsr sd_map_sectorbuffer
+        jsr setup_banner_load_pointer
+        jsr sd_map_sectorbuffer
 
-	;;  Check if we have BANNER.M65 embedded in flash.
+        ;;  Check if we have BANNER.M65 embedded in flash.
 
-	;; Load first sector of flash to check for banner present
-	;; byte.
-	lda #$00
-	ldx #3
+        ;; Load first sector of flash to check for banner present
+        ;; byte.
+        lda #$00
+        ldx #3
 @zoop:
-	sta $d681,x
-	dex
-	bpl @zoop
-	lda #$53
-	sta $d680
-	;; Wait a little while for flash to read
+        sta $d681,x
+        dex
+        bpl @zoop
+        lda #$53
+        sta $d680
+        ;; Wait a little while for flash to read
 @zoop2:
-	dex
-	bne @zoop2
-	lda $de71
-	cmp #$01
-	beq loadbannerfromflash
-	jmp sd_unmap_sectorbuffer
+        dex
+        bne @zoop2
+        lda $de71
+        cmp #$01
+        beq loadbannerfromflash
+        jmp sd_unmap_sectorbuffer
 
 loadbannerfromflash:
-	;; Load and display boot logo
-	;; Logo will be at $7F8000-$7FFFFF
+        ;; Load and display boot logo
+        ;; Logo will be at $7F8000-$7FFFFF
 
-	lda #$80
-	sta $d682
-	lda #$7f
-	sta $d683
+        lda #$80
+        sta $d682
+        lda #$7f
+        sta $d683
         lda #$00
-	sta $d681
-	sta $d684
+        sta $d681
+        sta $d684
 
         jsr sd_map_sectorbuffer
 
 nextflashbannersector:
 
-	lda #$53
-	sta $d680
-	;; No need to wait long here, because our copy routine is so slow
-	;; Use the #$53 above
+        lda #$53
+        sta $d680
+        ;; No need to wait long here, because our copy routine is so slow
+        ;; Use the #$53 above
 @zzminus:
-	dec
-	bpl @zzminus
-	;; Leaves A=$00 which we use below for TAx/z to save bytes
+        dec
+        bpl @zzminus
+        ;; Leaves A=$00 which we use below for TAx/z to save bytes
 
 stashbannersector:
 
-	;;  Advance $100 bytes to next flash sector
-	inc $d682
+        ;;  Advance $100 bytes to next flash sector
+        inc $d682
 
-	ldx #0
-	ldz #0
+        ldx #0
+        ldz #0
 
         ;; Actually write the bytes to memory that have been loaded
 zdrfim_rr1:
@@ -1254,15 +1254,15 @@ zdrfim_rr1:
         sta [<dos_file_loadaddress],z
         inz ;; dest offset
         inx ;; src offset
-	bne zdrfim_rr1
+        bne zdrfim_rr1
 
         inc <dos_file_loadaddress+1
-	bne nextflashbannersector
+        bne nextflashbannersector
 
-	jsr sd_unmap_sectorbuffer
+        jsr sd_unmap_sectorbuffer
 
-	;; Now display it
-	jmp setbannerpalette
+        ;; Now display it
+        jmp setbannerpalette
 
 
 setup_banner_load_pointer:
@@ -1277,7 +1277,7 @@ setup_banner_load_pointer:
         sta <dos_file_loadaddress+2
         lda #$00
         sta <dos_file_loadaddress+3
-	rts
+        rts
 
 
 attempt_loadcharrom:
@@ -1586,12 +1586,12 @@ resetdisplay:
         lda #$00        ;; black
         sta $D020       ;; border
         sta $D021       ;; background
-	sta $D711 	;; Disable DMA audio
+        sta $D711         ;; Disable DMA audio
 
         ;; Start in 60Hz mode, since most monitors support it
         ;; (Also required to make sure matrix mode pixels aren't ragged on first boot).
-	;; The label here is used so that the syspartition settings can be used to
-	;; change the default video mode on reset.
+        ;; The label here is used so that the syspartition settings can be used to
+        ;; change the default video mode on reset.
 pal_ntsc_minus_1:
         lda #$80
         sta $d06f
@@ -1631,7 +1631,7 @@ pal_ntsc_minus_1:
 
         ;; Now switch to 16-bit text mode so that we can use proportional
         ;; characters and full-colour characters for chars >$FF for the logo
-	;; Also enable CRT emulation by default.
+        ;; Also enable CRT emulation by default.
         ;;
         lda #$e5
         sta $d054        ;; VIC-IV Control Register C
@@ -1655,11 +1655,11 @@ resetpalette:
         lda #$04
         tsb $D030        ;; enable PAL bit in $D030
 
-	jsr setbannerpalette
+        jsr setbannerpalette
 
         ;; C64 colours designed to look like C65 colours on an
         ;; RGBI screen.
-	ldx #$0F
+        ldx #$0F
 -       lda c64_colours_table+$00,x     ; load & store red component
         sta $D100,x
         lda c64_colours_table+$10,x     ; load & store green component
@@ -1669,13 +1669,13 @@ resetpalette:
         dex
         bpl -
 
-	rts
-	
+        rts
+
 c64_colours_table:
         ;   0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | A | B | C | D | E | F
         !8 $00,$ff,$ba,$66,$bb,$55,$d1,$ae,$9b,$87,$dd,$b5,$b8,$0b,$aa,$8b  ; -- red
         !8 $00,$ff,$13,$ad,$f3,$ec,$e0,$5f,$47,$37,$39,$b5,$b8,$4f,$d9,$8b  ; -- green
-        !8 $00,$ff,$62,$ff,$8b,$85,$79,$c7,$81,$00,$78,$b5,$b8,$ca,$fe,$8b  ; -- blue	
+        !8 $00,$ff,$62,$ff,$8b,$85,$79,$c7,$81,$00,$78,$b5,$b8,$ca,$fe,$8b  ; -- blue
 
 ;;         ========================
 
@@ -1784,7 +1784,7 @@ setbannerpalette:
         lda #$ff
         sta $D070        ;; select palette bank 3 for display and edit
 
-	;; Set DMA list address
+        ;; Set DMA list address
         ;;
         lda #>bannerpalettedmalist
         sta $d701
@@ -1883,14 +1883,14 @@ pm22:
         cpx #25
         bne pm2
 
-	jsr scroll_screen
-	ldx #24
-	stx screenrow
+        jsr scroll_screen
+        ldx #24
+        stx screenrow
 
         ;; work out the screen address
         ;;
 pm2:
-	cpx #$00
+        cpx #$00
         beq pm1
 
         clc
@@ -1945,13 +1945,13 @@ endofmessage:
         inc screenrow
 
 !if DEBUG_HYPPO {
-	;; XXX DEBUG
-	;; Require key press after each line displayed.
-;;	jsr debug_wait_on_key
+        ;; XXX DEBUG
+        ;; Require key press after each line displayed.
+;;        jsr debug_wait_on_key
 }
 
-	plz
-	rts
+        plz
+        rts
 
 printbanner:
         stx <zptempp
@@ -2018,38 +2018,38 @@ go64:
 ;;  C64-mode kernel on the C65 checks if C65 mode
 ;;  should be entered.)
 
-	;; Prevent utility menu from being launched
-	lda #$4c
-	sta utility_menu
+        ;; Prevent utility menu from being launched
+        lda #$4c
+        sta utility_menu
 
-	;; Prevent flash menu from being launched
-	lda #$4c
-	sta first_boot_flag_instruction
+        ;; Prevent flash menu from being launched
+        lda #$4c
+        sta first_boot_flag_instruction
 
-	;; Warn user if dipswitch 3 is on
-	lda $d69d
-	and #$04
-	beq l41
+        ;; Warn user if dipswitch 3 is on
+        lda $d69d
+        and #$04
+        beq l41
         ldx #<msg_dipswitch3on
         ldy #>msg_dipswitch3on
         jsr printmessage
 l40a:
-	;; Wait for user to press RUN/STOP to continue booting
-	lda ascii_key_in
-	beq l40b
-	cmp #$03
-	beq l41
-	sta ascii_key_in
+        ;; Wait for user to press RUN/STOP to continue booting
+        lda ascii_key_in
+        beq l40b
+        cmp #$03
+        beq l41
+        sta ascii_key_in
 l40b:
-	inc $d020
-	bra l40a
+        inc $d020
+        bra l40a
 l41:
-	;; remove RUN/STOP from key queue
-	sta ascii_key_in
+        ;; remove RUN/STOP from key queue
+        sta ascii_key_in
 
         ;; Check if hold boot switch is set (control-key)
         ;;
-	lda buckykey_status
+        lda buckykey_status
         and #$04
         beq l42      ;; no, so continue
 
@@ -2098,9 +2098,9 @@ g61:    sta $0800,x
         jsr task_set_pc_to_reset_vector
         jsr task_dummy_nmi_vector
 
-	;; Enable cartridge again
-	lda #$02
-	tsb $d7fb
+        ;; Enable cartridge again
+        lda #$02
+        tsb $d7fb
 
         ;; This must happen last, so that the ultimax cartridge
         ;; reset vector is used, instead of the one in the loaded ROM
@@ -2265,8 +2265,8 @@ resetmemmap:
 
 utility_menu_check:
         lda buckykey_status
-	cmp #$20 ;; NO-SCROLL
-	beq @startFlashMenu
+        cmp #$20 ;; NO-SCROLL
+        beq @startFlashMenu
         cmp #$03 ;; both SHIFT
         beq @startUtilMenu
         and #$10 ;; ALT
@@ -2276,13 +2276,13 @@ utility_menu_check:
 @startUtilMenu:
         jmp utility_menu
 @startFlashMenu:
-	;; ... but only if available
-	lda first_boot_flag_instruction
-	cmp #$4c
-	beq @flashMenuNoAvail
-	jmp launch_flash_menu
+        ;; ... but only if available
+        lda first_boot_flag_instruction
+        cmp #$4c
+        beq @flashMenuNoAvail
+        jmp launch_flash_menu
 @flashMenuNoAvail:
-	jmp noflash_menu
+        jmp noflash_menu
 
 keyboardread:
 
@@ -2577,38 +2577,38 @@ cpnth1: adc #$06
 ;;       Scan the 32KB colour RAM looking for pre-loaded utilities.
 ;;       Offer for the user to be able to launch one of them
 
-	;; Tell user what to do if they can't access the utility menu
+        ;; Tell user what to do if they can't access the utility menu
 noutility_menu:
         ldx #<msg_noutilitymenu
         ldy #>msg_noutilitymenu
         jsr printmessage
-	inc $d020
+        inc $d020
 num1:
-	jmp num1
+        jmp num1
 
 safe_video_mode:
-	;; No digital audio, just pure DVI
-	lda #$02
-	sta $d61a
-	;; NTSC
-	lda #$80
-	sta $d06f
-	rts
+        ;; No digital audio, just pure DVI
+        lda #$02
+        sta $d61a
+        ;; NTSC
+        lda #$80
+        sta $d06f
+        rts
 
 utility_menu:
-	;; Gets self-modified to prevent entering utility menu except on first boot
-	bit noutility_menu
+        ;; Gets self-modified to prevent entering utility menu except on first boot
+        bit noutility_menu
 
-	;; Disable digital audio when utility menu
-	jsr safe_video_mode
+        ;; Disable digital audio when utility menu
+        jsr safe_video_mode
 
         ;; Display GIT commit again, so that it's easy to check commit of a build
         ldx #<msg_gitcommit
         ldy #>msg_gitcommit
         jsr printmessage
 
-	;; Display utility menu message
-	ldx #<msg_utilitymenu
+        ;; Display utility menu message
+        ldx #<msg_utilitymenu
         ldy #>msg_utilitymenu
         jsr printmessage
 
@@ -2698,8 +2698,8 @@ ueol1:
         adc #0
         sta utility_dmalist_srcaddr+1
 
-	;; We have to call this before initialising OpenROM
-	jsr setup_for_openrom
+        ;; We have to call this before initialising OpenROM
+        jsr setup_for_openrom
 
         ;; load address is always $07FF (to skip $0801 header)
         ;; start @ zptempv32 + 44
@@ -2745,9 +2745,9 @@ ueol1:
 
 flash_menu:
 
-	;; Run the flash menu which is pre-loaded into memory on first boot
-	;; (in the FPGA BRAM).
-	;; Also DMA copy our current screen safely somewhere for later restoration
+        ;; Run the flash menu which is pre-loaded into memory on first boot
+        ;; (in the FPGA BRAM).
+        ;; Also DMA copy our current screen safely somewhere for later restoration
 
         lda #$ff
         sta $d702
@@ -2759,110 +2759,110 @@ flash_menu:
         lda #<flashmenu_dmalist
         sta $d705
 
-	;; FALL THROUGH
+        ;; FALL THROUGH
 run_util_in_hypervisor_context:
-	;; XXX Move Stack and ZP to normal places, before letting C64 KERNAL loose on
-	;; Hypervisor memory map!
-	lda #$00
-	!8 $5B ;; tab
-	ldy #$01
-	!8 $2B ;; tys
-
-	jsr setup_for_openrom
-	;; XXX Work around bug in OpenROMs that erases our banner palette when we do this
-	;; by putting the palette back immediately.
+        ;; XXX Move Stack and ZP to normal places, before letting C64 KERNAL loose on
+        ;; Hypervisor memory map!
+        lda #$00
+        !8 $5B ;; tab
+        ldy #$01
+        !8 $2B ;; tys
+
+        jsr setup_for_openrom
+        ;; XXX Work around bug in OpenROMs that erases our banner palette when we do this
+        ;; by putting the palette back immediately.
         jsr setbannerpalette
 
-	;; Actually launch the utility in the hypervisor context
-	;; (so must not use RAM > $7FFF, is immune to freezing etc)
-	jmp $080d
+        ;; Actually launch the utility in the hypervisor context
+        ;; (so must not use RAM > $7FFF, is immune to freezing etc)
+        jmp $080d
 
 setup_for_openrom:
 
-	;; Bank in KERNAL ROM space so megaflash can run
-	;; Writing to $01 when ZP is relocated is a bit tricky, as
-	;; we have to mess about with the Base Register, or force
-	;; the assembler to do an absolute write.
-	lda #$37
-	!8 $8d,$01,$00 ;; ABS STA $0001
-
-	;; We should also reset video mode to normal
-	lda #$97
-	trb $d054
-
-	;; Clear memory map at $4000-5FFF
-	;; (Why on earth do we even map some of the HyperRAM there, anyway???)
-	lda #0
-	tax
-	tay
-	ldz #$3f
-	map
-	eom
-	;; And set MB low to $00, so that OpenROM doesn't jump into lala land
-	lda #0
-	ldx #$0f
-	map
-	eom
-
-	;; Tell KERNAL screen is at $0400
-	lda #>$0400
-	sta $0288
-
-	lda $fff9
-	cmp #$ff
-	beq @notOpenROM
-	;; OpenROMs setup (XXX Won't work with Commodore C65 ROMs!)
-	jsr ($fff8)
+        ;; Bank in KERNAL ROM space so megaflash can run
+        ;; Writing to $01 when ZP is relocated is a bit tricky, as
+        ;; we have to mess about with the Base Register, or force
+        ;; the assembler to do an absolute write.
+        lda #$37
+        !8 $8d,$01,$00 ;; ABS STA $0001
+
+        ;; We should also reset video mode to normal
+        lda #$97
+        trb $d054
+
+        ;; Clear memory map at $4000-5FFF
+        ;; (Why on earth do we even map some of the HyperRAM there, anyway???)
+        lda #0
+        tax
+        tay
+        ldz #$3f
+        map
+        eom
+        ;; And set MB low to $00, so that OpenROM doesn't jump into lala land
+        lda #0
+        ldx #$0f
+        map
+        eom
+
+        ;; Tell KERNAL screen is at $0400
+        lda #>$0400
+        sta $0288
+
+        lda $fff9
+        cmp #$ff
+        beq @notOpenROM
+        ;; OpenROMs setup (XXX Won't work with Commodore C65 ROMs!)
+        jsr ($fff8)
 @notOpenROM:
-	;; make sure not in quote mode etc
-	lda #$00
-	sta $d8 ;; number of insertions outstanding = 0
-	sta $0f ;; clear quote mode
-
-	;; Clear common interrupt sources
-
-	;; CIAs
-;;	lda #$ff
-;;	sta $dc0d
-;;	sta $dd0d
-;;	lda $dc0d
-;;	lda $dd0d
-
-	;; VIC-IV
-;;	dec $d019
-;;	lda #$00
-;;	sta $d01a
-
-	;; Ethernet
-;;	lda #$00
-;;	sta $d6e1
-
-	;; C65 UART
-	;; XXX Actually it can't generate interrupts yet, so nothing to do :)
-
-	;; Finally, clear any pending interrupts by using MAP instruction
-;;	tax
-;;	tay
-;;	taz
-;;	map
-;;	lda #0    ;; to give time to effect clearing irq_pending in CPU
-;;	eom
-
-	;; And ignore any queued NMI (these don't get cleared by the MAP trick)
-
-	;;  Clear pending NMI flag
+        ;; make sure not in quote mode etc
+        lda #$00
+        sta $d8 ;; number of insertions outstanding = 0
+        sta $0f ;; clear quote mode
+
+        ;; Clear common interrupt sources
+
+        ;; CIAs
+;;        lda #$ff
+;;        sta $dc0d
+;;        sta $dd0d
+;;        lda $dc0d
+;;        lda $dd0d
+
+        ;; VIC-IV
+;;        dec $d019
+;;        lda #$00
+;;        sta $d01a
+
+        ;; Ethernet
+;;        lda #$00
+;;        sta $d6e1
+
+        ;; C65 UART
+        ;; XXX Actually it can't generate interrupts yet, so nothing to do :)
+
+        ;; Finally, clear any pending interrupts by using MAP instruction
+;;        tax
+;;        tay
+;;        taz
+;;        map
+;;        lda #0    ;; to give time to effect clearing irq_pending in CPU
+;;        eom
+
+        ;; And ignore any queued NMI (these don't get cleared by the MAP trick)
+
+        ;;  Clear pending NMI flag
         lda hypervisor_feature_enables
-	and #$7f
+        and #$7f
         sta hypervisor_feature_enables
 
-	;; Set safety-net NMI handler
-	lda #$40
-	sta $0420
-	lda #<$0420
-	sta $0318
-	lda #>$0420
-	sta $0319
-	rts
+        ;; Set safety-net NMI handler
+        lda #$40
+        sta $0420
+        lda #<$0420
+        sta $0318
+        lda #>$0420
+        sta $0319
+        rts
 
 flashmenu_dmalist:
         ;; copy $50000-$577FF to $00007FF-$0007FFFF
@@ -2872,7 +2872,7 @@ flashmenu_dmalist:
         !8 $80,$00  ;; Copy from $00xxxxx
         !8 $81,$00  ;; Copy to $00xxxxx
 
-	;; Copy screen from $0400-$0BFF to $00009000
+        ;; Copy screen from $0400-$0BFF to $00009000
         !8 $00 ;; no more options
         ;; F018A DMA list
         !8 $04 ;; copy + chained
@@ -2883,9 +2883,9 @@ flashmenu_dmalist:
         !8 $00   ;; of bank $5
         !16 $0000 ;; modulo (unused)
 
-	;; Copy program down
+        ;; Copy program down
         !8 $00 ;; no more options
-	;; F018A DMA list
+        ;; F018A DMA list
         !8 $00 ;; copy + not chained request
         !16 $77FF ;; size of copy
         !16 $0000 ;; starting addr
@@ -2913,7 +2913,7 @@ scroll_screen:
         sta $d702
         sta $d704  ;; dma list is in top MB of address space
 
-	;; Don't forget to reset colour RAM also
+        ;; Don't forget to reset colour RAM also
         lda #>scrollscreen_dmalist
         sta $d701
         ;; set bottom 8 bits of address and trigger DMA.
@@ -2921,7 +2921,7 @@ scroll_screen:
         lda #<scrollscreen_dmalist
         sta $d705
 
-	rts
+        rts
 
 scrollscreen_dmalist:
         !8 $80,$00  ;; Copy from $00xxxxx
@@ -3033,9 +3033,9 @@ utillist_rewind:
 serialwrite:
         ;; write character to serial port
 
-	;; First wait for it to go ready
-	ldx hypervisor_write_char_to_serial_monitor
-	bne serialwrite
+        ;; First wait for it to go ready
+        ldx hypervisor_write_char_to_serial_monitor
+        bne serialwrite
 
         ;; XXX - Have some kind of permission control on this
         ;; XXX - $D67C should not work when matrix mode is enabled at all?
@@ -3071,12 +3071,12 @@ msg_utilitymenu:
         !8 0
 
 msg_noutilitymenu:
-		        !text "HOLD ALT + POWER CYCLE FOR UTILITY MENU"
-	                !8 0
+                        !text "HOLD ALT + POWER CYCLE FOR UTILITY MENU"
+                        !8 0
 
 msg_noflashmenu:
-		        !text "HOLD NO SCROLL + POWER CYCLE FOR FLASH"
-	                !8 0
+                        !text "HOLD NO SCROLL + POWER CYCLE FOR FLASH"
+                        !8 0
 
 msg_retryreadmbr:       !text "RE-TRYING TO READ MBR"
                         !8 0
@@ -3211,9 +3211,9 @@ txt_BOOTLOGOM65:        !text "BANNER.M65"
 txt_FREEZER:            !text "FREEZER.M65"
                         !8 0
 
-txt_ETHLOAD:		!text "ETHLOAD.M65"
-			!8 0
-	
+txt_ETHLOAD:                !text "ETHLOAD.M65"
+                        !8 0
+
             ;; If this file is present, then machine starts up with video
             ;; mode set to NTSC (60Hz), else as PAL (50Hz).
             ;; This is to allow us to boot in PAL by default, except for
@@ -3560,6 +3560,6 @@ d71_clustersneeded:
 d81_clustercount:
         !16 0
 
-	;; Make sure we pad to full size
-	* = Hyppo_End
-	!8 0
+        ;; Make sure we pad to full size
+        * = Hyppo_End
+        !8 0
diff --git a/src/hyppo/mem.asm b/src/hyppo/mem.asm
index 82eb71439..d71361d88 100644
--- a/src/hyppo/mem.asm
+++ b/src/hyppo/mem.asm
@@ -1,6 +1,6 @@
 ;; /*  -------------------------------------------------------------------
 ;;     MEGA65 "HYPPOBOOT" Combined boot and hypervisor ROM.
-;;     Paul Gardner-Stephen, 2014-2019.
+;;     Paul Gardner-Stephen, 2014-2024.
 ;;     ---------------------------------------------------------------- */
 
 ;; Display error and infinite loop on page fault
diff --git a/src/hyppo/process_descriptor.asm b/src/hyppo/process_descriptor.asm
index 0ec0007cd..76499d17e 100644
--- a/src/hyppo/process_descriptor.asm
+++ b/src/hyppo/process_descriptor.asm
@@ -1,6 +1,6 @@
 ;; /*  -------------------------------------------------------------------
 ;;     MEGA65 "HYPPOBOOT" Combined boot and hypervisor ROM.
-;;     Paul Gardner-Stephen, 2014-2019.
+;;     Paul Gardner-Stephen, 2014-2024.
 ;;     ---------------------------------------------------------------- */
 
         ;; Process descriptor block (fixed 256 bytes)
@@ -10,7 +10,7 @@
 
         ;; Process description (first 128 bytes)
 
-	start = *
+        start = *
 currenttask_block:
 
         ;; Tasks are idenfied by what amounts to an 8-bit process id.
@@ -40,15 +40,15 @@ currenttask_d81_image0_name:
 currenttask_d81_image1_name:
         !text "                                "
 
-	;; DOS work area is full, so some things over-flow here:
-	
-	;; Used to temporarily stash the currently read SD card sector.
-	;; (mostly to hide when we have to read a FAT sector during file
-	;; access)
+        ;; DOS work area is full, so some things over-flow here:
+
+        ;; Used to temporarily stash the currently read SD card sector.
+        ;; (mostly to hide when we have to read a FAT sector during file
+        ;; access)
 dos_stashed_sd_sector_number:
-	!8 0,0,0,0
-	
-	
+        !8 0,0,0,0
+
+
         ;; Make sure we don't over-flow the available space
         * = start + $80
 
diff --git a/src/hyppo/sdfat.asm b/src/hyppo/sdfat.asm
index 8ed53ddcb..d32067fd2 100644
--- a/src/hyppo/sdfat.asm
+++ b/src/hyppo/sdfat.asm
@@ -1,6 +1,6 @@
 ;; /*  -------------------------------------------------------------------
 ;;     MEGA65 "HYPPOBOOT" Combined boot and hypervisor ROM.
-;;     Paul Gardner-Stephen, 2014-2019.
+;;     Paul Gardner-Stephen, 2014-2024.
 
 ;;     These routines provide support for FAT32 and SDCARD support.
 ;;     ---------------------------------------------------------------- */
@@ -97,22 +97,22 @@ issdhc:
 ;;     SD Card access routines
 ;;     ---------------------------------------------------------------- */
 
-sd_open_write_gate:	
-	lda #$57
-	sta $d680
-	rts
+sd_open_write_gate:
+        lda #$57
+        sta $d680
+        rts
 
 write_non_mbr_sector:
-	jsr sd_open_write_gate
-	jmp write_sector_trigger
+        jsr sd_open_write_gate
+        jmp write_sector_trigger
 write_mbr_sector:
-	lda #$4D
-	sta $d680
-write_sector_trigger:	
-	lda #$03
-	sta $d680
-	rts
-	
+        lda #$4D
+        sta $d680
+write_sector_trigger:
+        lda #$03
+        sta $d680
+        rts
+
 
 sd_wait_for_ready:
         jsr sdtimeoutreset
diff --git a/src/hyppo/securemode.asm b/src/hyppo/securemode.asm
index 7d928f0ba..3d84a1ba8 100644
--- a/src/hyppo/securemode.asm
+++ b/src/hyppo/securemode.asm
@@ -1,6 +1,6 @@
 ;; /*  -------------------------------------------------------------------
 ;;     MEGA65 "HYPPOBOOT" Combined boot and hypervisor ROM.
-;;     Paul Gardner-Stephen, 2014-2019.
+;;     Paul Gardner-Stephen, 2014-2024.
 ;;     ---------------------------------------------------------------- */
 
 securemode_trap:
diff --git a/src/hyppo/syspart.asm b/src/hyppo/syspart.asm
index 9c235caf2..016034a20 100644
--- a/src/hyppo/syspart.asm
+++ b/src/hyppo/syspart.asm
@@ -1,6 +1,6 @@
 ;; /*  -------------------------------------------------------------------
 ;;     MEGA65 "HYPPOBOOT" Combined boot and hypervisor ROM.
-;;     Paul Gardner-Stephen, 2014-2019.
+;;     Paul Gardner-Stephen, 2014-2024.
 
 ;;    MEGA65 System Partition functions
 
@@ -44,28 +44,28 @@
 ;;     to be free.
 ;;     ---------------------------------------------------------------- */
 
-onboarding_dmalist:	
+onboarding_dmalist:
         ;; MEGA65 Enhanced DMA options
         !8 $0A      ;; Request format is F018A
         !8 $80,$00  ;; Copy from $00xxxxx
         !8 $81,$00  ;; Copy to $00xxxxx
 
-	;; Copy program down
+        ;; Copy program down
         !8 $00 ;; no more options
-	;; F018A DMA list
+        ;; F018A DMA list
         !8 $00 ;; copy + not chained request
-        !16 $77FF ;; size of copy 
-        !16 $0000 ;; starting addr 
+        !16 $77FF ;; size of copy
+        !16 $0000 ;; starting addr
         !8 $04   ;; of bank $5
         !16 $07FF ;; destination address is $0801 - 2
         !8 $00   ;; of bank $0
         !16 $0000 ;; modulo (unused)
 
 
-	
+
 launch_onboarding:
 
-	;; DMA copy the onboarding utility into place
+        ;; DMA copy the onboarding utility into place
         lda #$ff
         sta $d702
         ;; lda #$ff
@@ -74,13 +74,13 @@ launch_onboarding:
         sta $d701
         ;; Trigger enhanced DMA
         lda #<onboarding_dmalist
-        sta $d705	
-	
-	;; Run util from in hypervisor context, similarly to how we run the flash menu
-	;; this means the whole thing must be less than ~29KB in size, to not run over
-	;; $8000-$BFFF where the hypervisor is mapped
-	jmp run_util_in_hypervisor_context
-	
+        sta $d705
+
+        ;; Run util from in hypervisor context, similarly to how we run the flash menu
+        ;; this means the whole thing must be less than ~29KB in size, to not run over
+        ;; $8000-$BFFF where the hypervisor is mapped
+        jmp run_util_in_hypervisor_context
+
 syspart_open:
         ;; Open a system partition.
         ;; At this point, only syspart_start_sector and
@@ -104,7 +104,7 @@ spo1:   lda syspart_start_sector,x
         lda #syspart_error_badmagic
         sta syspart_error_code
         ldx #10
-spo2:	lda $de00,x
+spo2:        lda $de00,x
         cmp syspart_magic,x
         bne syspart_openerror
         dex
@@ -116,7 +116,7 @@ spo2:	lda $de00,x
         ;; Copy bytes from offset $10 - $2F into syspart_structure
         ;; XXX It is assumed that these fields are aligned with each other
         ldx #$10
-spo3:	lda $de00,x
+spo3:        lda $de00,x
         sta syspart_structure,x
         inx
         cpx #$30
@@ -137,7 +137,7 @@ spo3:	lda $de00,x
         jsr printhex
 
         ;; Show size of freeze slots
-        ldz syspart_freeze_slot_size_in_sectors+3 
+        ldz syspart_freeze_slot_size_in_sectors+3
         jsr printhex
         ldz syspart_freeze_slot_size_in_sectors+2
         jsr printhex
@@ -154,9 +154,9 @@ spo3:	lda $de00,x
         jsr printmessage
 
         jsr syspart_configsector_read
-	lda $de0e
-	bpl do_launch_onboarding
-no_onboarding:	
+        lda $de0e
+        bpl do_launch_onboarding
+no_onboarding:
         jsr syspart_configsector_apply
         bcs spo4
 
@@ -164,9 +164,9 @@ no_onboarding:
         ldy #>msg_syspart_config_invalid
         jsr printmessage
 
-spo4:	sec
+spo4:        sec
         rts
-	
+
 syspart_openerror:
 
         ;; Report error opening system partition
@@ -182,12 +182,12 @@ syspart_openerror:
         rts
 
 do_launch_onboarding:
-	;; Only try onboarding on first boot
-	lda first_boot_flag_instruction
-	cmp #$4c
-	beq no_onboarding
-	jmp launch_onboarding
-	
+        ;; Only try onboarding on first boot
+        lda first_boot_flag_instruction
+        cmp #$4c
+        beq no_onboarding
+        jmp launch_onboarding
+
         ;; XXX These should return success/failure indication
 syspart_configsector_read_trap:
         jsr syspart_configsector_read
@@ -210,26 +210,26 @@ syspart_unfreeze_from_slot_trap:
         jsr syspart_locate_freezeslot
         jsr unfreeze_load_from_sdcard_immediate
 
-	;; Set task ID to $00 if it was $ff, so that you can't unfreeze something,
-	;; and have the hypervisor think that it loaded it
-	lda currenttask_id
-	cmp #$ff
-	bne wasnt_ff
-	lda #$00
-	sta currenttask_id
-wasnt_ff:	
-	
-	;;  Make sure we resume a frozen program on the same raster line as
-	;; it entered the freezer.  This might need a bit of tuning to get
-	;; perfect, but it should already be accurate to within one raster line.
-
-	
-	lda #$ff
+        ;; Set task ID to $00 if it was $ff, so that you can't unfreeze something,
+        ;; and have the hypervisor think that it loaded it
+        lda currenttask_id
+        cmp #$ff
+        bne wasnt_ff
+        lda #$00
+        sta currenttask_id
+wasnt_ff:
+
+        ;;  Make sure we resume a frozen program on the same raster line as
+        ;; it entered the freezer.  This might need a bit of tuning to get
+        ;; perfect, but it should already be accurate to within one raster line.
+
+
+        lda #$ff
 @unfreezesyncwait:
-	cmp $d012
-	bne @unfreezesyncwait
-	;; Clear any pending raster interrupt, to avoid problems.
-	dec $d019 
+        cmp $d012
+        bne @unfreezesyncwait
+        ;; Clear any pending raster interrupt, to avoid problems.
+        dec $d019
         sta hypervisor_enterexit_trigger
 
 syspart_get_slot_count_trap:
@@ -265,7 +265,7 @@ splf1:
         cpy syspart_freeze_slot_count+1
         beq sc1
         bcc slotnumok
-sc1:	cpx syspart_freeze_slot_count+0
+sc1:        cpx syspart_freeze_slot_count+0
         beq slotbad
         bcc slotnumok
 slotbad:
@@ -288,7 +288,7 @@ slotnumok:
         ;; SDHC, so unit is sectors, and so is just a case of copying the bytes
         ;; Start by shifting down by 1 byte = /256
         ldx #$03
-splf4b:	lda syspart_freeze_slot_size_in_sectors,x
+splf4b:        lda syspart_freeze_slot_size_in_sectors,x
         sta mult48_d0,x
         dex
         bpl splf4b
@@ -307,7 +307,7 @@ splf4b:	lda syspart_freeze_slot_size_in_sectors,x
         ldx #0
         ldy #3
         clc
-splf3:	lda mult48_result0,x
+splf3:        lda mult48_result0,x
         adc $d681,x
         sta $d681,x
         inx
@@ -326,7 +326,7 @@ syspart_locate_freezeslot_0:
         adc syspart_freeze_area_start+0
         sta $d681
         ldx #1
-splf2:	lda syspart_start_sector,x
+splf2:        lda syspart_start_sector,x
         adc syspart_freeze_area_start,x
         sta $d681,x
         inx
@@ -350,16 +350,16 @@ splf2:	lda syspart_start_sector,x
 
 
 syspart_configsector_set:
-	;; So, the config sector USED to live in the system partition.
-	;; But that causes a few problems:
-	;; 1. You need a system partition, just to be able to pick PAL or NTSC on start.
-	;; 2. The utility menu now, for good reason, appears before trying to probe any
-	;;    SD cards. This means that the configure programme couldn't work out the
-	;;    correct sector to work on.
-	;; As a result, we now just officially have the config sector live in sector 1.
+        ;; So, the config sector USED to live in the system partition.
+        ;; But that causes a few problems:
+        ;; 1. You need a system partition, just to be able to pick PAL or NTSC on start.
+        ;; 2. The utility menu now, for good reason, appears before trying to probe any
+        ;;    SD cards. This means that the configure programme couldn't work out the
+        ;;    correct sector to work on.
+        ;; As a result, we now just officially have the config sector live in sector 1.
         ldx #3
-	lda #0
-spcr1:	;; lda syspart_start_sector,x
+        lda #0
+spcr1:        ;; lda syspart_start_sector,x
         sta $d681,x
         dex
         bpl spcr1
@@ -371,14 +371,14 @@ syspart_configsector_read:
 
 syspart_configsector_write:
         jsr syspart_configsector_set
-	jsr write_non_mbr_sector
+        jsr write_non_mbr_sector
         sec
         rts
 
 syspart_config_invalid:
         clc
         rts
-	
+
 syspart_configsector_apply:
         ;; Check version
         lda $de00
@@ -392,12 +392,12 @@ syspart_configsector_apply:
         lda $de20
         sta $d703
 
-	;; Set $D054 options
-	;; (eg scanline emulation ($20) and horizontal blur filter ($08))
-	lda #$28
-	trb $d054
-	and $de21
-	tsb $d054
+        ;; Set $D054 options
+        ;; (eg scanline emulation ($20) and horizontal blur filter ($08))
+        lda #$28
+        trb $d054
+        and $de21
+        tsb $d054
 
         ;; Set PAL/NTSC mode (keeping $D058 value)
         ldx $d058
@@ -408,8 +408,8 @@ syspart_configsector_apply:
         and #$c0
         ora $d06f
         sta $d06f
-	;; And also write it into the instruction that sets the display mode on reset
-	sta pal_ntsc_minus_1+1
+        ;; And also write it into the instruction that sets the display mode on reset
+        sta pal_ntsc_minus_1+1
         stx $d058
 
         ;; set CIA TOD50 flag depending on PAL/NTSC
@@ -433,39 +433,39 @@ syspart_configsector_apply:
 @skiptod50end:
 
         ;; Set audio and related options
-	lda $de0d
-	sta $d61a
-	lda #$00
-	sta $d63c
-	lda $de22
-	beq @sid6581
-	lda #$0f
-	sta $d63c
+        lda $de0d
+        sta $d61a
+        lda #$00
+        sta $d63c
+        lda $de22
+        beq @sid6581
+        lda #$0f
+        sta $d63c
 @sid6581:
-	
-
-	;; Trigger onboarding menu or not
-	;; (activated elsewhere)
-	// $de0e bit 7
-	
-	;; Super SFX cartridge emulation
-	lda $de0c
-	ldz #$00
-	lda #$07
-	sta zptempv32+3
-	ldx #$fe
-	stx zptempv32+2
-	inx
-	stx zptempv32+1
-	stx zptempv32+0
-	sta [<zptempv32],z	
-
-	;; Audio amplifier control
+
+
+        ;; Trigger onboarding menu or not
+        ;; (activated elsewhere)
+        // $de0e bit 7
+
+        ;; Super SFX cartridge emulation
+        lda $de0c
+        ldz #$00
+        lda #$07
+        sta zptempv32+3
+        ldx #$fe
+        stx zptempv32+2
+        inx
+        stx zptempv32+1
+        stx zptempv32+0
+        sta [<zptempv32],z
+
+        ;; Audio amplifier control
         lda $de03
         and #$01
         sta audioamp_ctl
 
-	;; Stereo flags
+        ;; Stereo flags
         lda $de03
         and #$40
         beq is_stereo
@@ -489,14 +489,14 @@ done_audio:
         lda $de05
         sta mouse_detect_ctrl
 
-	;; Enable/disable experimental long filename support
-	lda #$4c 		; Disable LFN support by default
-	sta disable_lfn_byte
-	lda $de0f
-	bpl @nolfn
-	;; Diable jump that disables LFN support 
-	lda #$2c 		; BIT $xxxx opcode
-	sta disable_lfn_byte
+        ;; Enable/disable experimental long filename support
+        lda #$4c                 ; Disable LFN support by default
+        sta disable_lfn_byte
+        lda $de0f
+        bpl @nolfn
+        ;; Diable jump that disables LFN support
+        lda #$2c                 ; BIT $xxxx opcode
+        sta disable_lfn_byte
 @nolfn:
         ;; Copy MAC address
         ldx #$05
@@ -511,10 +511,10 @@ maccopy:
         beq nodiskname
         ldx #$0f
 disknamecopy:
-        lda	$de10, x
-        sta	txt_MEGA65D81, x
+        lda        $de10, x
+        sta        txt_MEGA65D81, x
         dex
-        bpl	disknamecopy
+        bpl        disknamecopy
 nodiskname:
         sec
         rts
@@ -612,7 +612,7 @@ msg_syspart_info:
 msg_syspart_config_invalid:
         !text "SYSPART CONFIG INVALID. PLEASE SET."
         !8 0
-	
+
 syspart_trap:
         sei
         cld
diff --git a/src/hyppo/targetsetup.asm b/src/hyppo/targetsetup.asm
index 35b1f1419..24025db66 100644
--- a/src/hyppo/targetsetup.asm
+++ b/src/hyppo/targetsetup.asm
@@ -1,10 +1,15 @@
+;; /*  -------------------------------------------------------------------
+;;     MEGA65 "HYPPOBOOT" Combined boot and hypervisor ROM.
+;;     Paul Gardner-Stephen, 2014-2024.
+;;     ---------------------------------------------------------------- */
+
         ;; Setup functions for MEGAphone.
         ;; Basically setup the I2C IO expanders with sensible values, turning
         ;; all peripherals on.
 
 targetspecific_setup:
 
-	;; Setup common I2C area 32-bit pointer
+        ;; Setup common I2C area 32-bit pointer
         lda #<$7000
         sta zptempv32+0
         lda #>$7000
@@ -13,23 +18,23 @@ targetspecific_setup:
         sta zptempv32+2
         lda #>$0FFD
         sta zptempv32+3
-	
-	;; Apply I2C settings based on target ID
-	lda $d629
-	cmp #$03
-	beq mega65r3_i2c_setup
-	cmp #$04
-	beq mega65r4_i2c_setup
-	lda $d629
-	cmp #$20
-	beq megaphone_r1_i2c_setup
-	rts
+
+        ;; Apply I2C settings based on target ID
+        lda $d629
+        cmp #$03
+        beq mega65r3_i2c_setup
+        cmp #$04
+        beq mega65r4_i2c_setup
+        lda $d629
+        cmp #$20
+        beq megaphone_r1_i2c_setup
+        rts
 
 mega65r4_i2c_setup:
-	;; XXX - Add setup for MEGA65R4 board here
-	rts
+        ;; XXX - Add setup for MEGA65R4 board here
+        rts
 
-mega65r3_i2c_setup:	
+mega65r3_i2c_setup:
 
         lda #>$7100
         sta zptempv32+1
@@ -53,21 +58,21 @@ mps3_loop:
 
         ;; Keep writing it until it gets written
 -
- 	sta [<zptempv32],z
+         sta [<zptempv32],z
 
-	inc $d020	
+        inc $d020
         cmp [<zptempv32],z
         bne -
 
         jmp mps3_loop
-	
+
 megaphone_r1_i2c_setup:
 
         ;; Start with backscreen very dim, to avoid inrush current
         ;; causing FGPA power rail to sag.
         lda #$01
         sta $d6f0
-	
+
         lda #$00
         sta $d020
         ldy #$00
@@ -128,7 +133,7 @@ megaphone_r1_i2c_settings:
 
         !8 $FF,$FF ;; End of list marker
 
-mega65r3_i2c_settings:	
+mega65r3_i2c_settings:
         ;; Speaker amplifier configuration
         !8 $e1,$FF   ;; Left volume initial mute
         !8 $e2,$FF   ;; Right volume initial mute
diff --git a/src/hyppo/task.asm b/src/hyppo/task.asm
index f9058b767..baa9890e4 100644
--- a/src/hyppo/task.asm
+++ b/src/hyppo/task.asm
@@ -1,6 +1,6 @@
 ;; /*  -------------------------------------------------------------------
 ;;     MEGA65 "HYPPOBOOT" Combined boot and hypervisor ROM.
-;;     Paul Gardner-Stephen, 2014-2019.
+;;     Paul Gardner-Stephen, 2014-2024.
 ;;     ---------------------------------------------------------------- */
 
         ;; Return the next free task ID
@@ -54,10 +54,10 @@ task_set_c64_memorymap:
         lda #$01
         trb $d030
 
-	;; Clear 16-bit text mode, but keep CRT emulation and horizontal filter settings
-	lda #$d7
-        trb $d054	
-	
+        ;; Clear 16-bit text mode, but keep CRT emulation and horizontal filter settings
+        lda #$d7
+        trb $d054
+
         ;; 40 column mode normal C64 screen
         lda #$00
         sta $d030
@@ -172,19 +172,19 @@ task_asblankslate:
         rts
 
 task_set_as_system_task:
-	;; Task ID is reserved for the hypervisor and its helpers, and prevents freezing
-	lda #$ff
-	sta currenttask_id
-	rts
-	
+        ;; Task ID is reserved for the hypervisor and its helpers, and prevents freezing
+        lda #$ff
+        sta currenttask_id
+        rts
+
 ;;         ========================
 
 ethernet_remote_trap:
-	;; By sending a magic ethernet key press frame while the 2nd dip switch is set
-	;; will cause this trap to occur, if the key code is 1111111111111 (which
-	;; corresponds to no real key.
-	;; In response to this, we setup C64 mode, load ETHLOAD.M65 and then exit to it,
-	;; effectively passing control to the contents of the following ethernet frames.
+        ;; By sending a magic ethernet key press frame while the 2nd dip switch is set
+        ;; will cause this trap to occur, if the key code is 1111111111111 (which
+        ;; corresponds to no real key.
+        ;; In response to this, we setup C64 mode, load ETHLOAD.M65 and then exit to it,
+        ;; effectively passing control to the contents of the following ethernet frames.
         jsr dos_clear_filedescriptors
         jsr task_get_next_taskid
         sta currenttask_id
@@ -198,18 +198,18 @@ ethernet_remote_trap:
         ldx dos_default_disk
         jsr dos_cdroot
 
-        ;; Prepare 32-bit pointer for loading etherload at $FF87E00,	
-	;; This location is the last 512 bytes of the 32KB colour RAM we
-	;; can assume all models possess, and should result in the code not
-	;; getting in the way of loading programs of almost any size.
+        ;; Prepare 32-bit pointer for loading etherload at $FF87E00,
+        ;; This location is the last 512 bytes of the 32KB colour RAM we
+        ;; can assume all models possess, and should result in the code not
+        ;; getting in the way of loading programs of almost any size.
         ;;
-	lda #$00
+        lda #$00
         sta <dos_file_loadaddress+0
         lda #$7e
         sta <dos_file_loadaddress+1
         lda #$f8
         sta <dos_file_loadaddress+2
-	lda #$0f
+        lda #$0f
         sta <dos_file_loadaddress+3
 
 @tryAgain:
@@ -221,61 +221,61 @@ ethernet_remote_trap:
         jsr task_set_c64_memorymap
         jsr task_dummy_nmi_vector
 
-	;; Now enable MAP of colour RAM at $8000-$9FFF
-	;; $FF87E00 - $8000 = $FF7FE00
-	lda #$ff
-	sta hypervisor_maphimb
-	dec
-	sta hypervisor_maphilo
-	lda #$17
-	sta hypervisor_maphihi
+        ;; Now enable MAP of colour RAM at $8000-$9FFF
+        ;; $FF87E00 - $8000 = $FF7FE00
+        lda #$ff
+        sta hypervisor_maphimb
+        dec
+        sta hypervisor_maphilo
+        lda #$17
+        sta hypervisor_maphihi
+
 
-	
         ;; set entry point to $8000, i.e, the start
-	;; of the 8KB block of colour RAM we map at $8000-$9fff
+        ;; of the 8KB block of colour RAM we map at $8000-$9fff
         lda #<$8000
         sta hypervisor_pcl
         lda #>$8000
         sta hypervisor_pch
 
-	jmp safe_exit_to_loaded_program
-	
+        jmp safe_exit_to_loaded_program
+
 unstable_illegal_opcode_trap:
 kill_opcode_trap:
-	;; For now, just launch the freezer if an illegal opcode is hit that
-	;; we can't work with.
-	;; (Ideally later we will allow some clever tricks with at least the KIL
-	;; opcodes, e.g., to call the hypervisor from C64 mode)
+        ;; For now, just launch the freezer if an illegal opcode is hit that
+        ;; we can't work with.
+        ;; (Ideally later we will allow some clever tricks with at least the KIL
+        ;; opcodes, e.g., to call the hypervisor from C64 mode)
+
+        ;; FALL THROUGH
 
-	;; FALL THROUGH
-	
 restore_press_trap:
 
-	;; Check if we are already in the freezer?
-	lda currenttask_id
-	cmp #$ff
-	bne non_hypervisor_task
+        ;; Check if we are already in the freezer?
+        lda currenttask_id
+        cmp #$ff
+        bne non_hypervisor_task
 
-	;; Don't allow freezing if we are in a hypervisor task
+        ;; Don't allow freezing if we are in a hypervisor task
         sta hypervisor_enterexit_trigger
 
-non_hypervisor_task:	
-	
+non_hypervisor_task:
+
         ;; Clear colour RAM at $DC00 flag, as it causes no end of trouble
         lda #$01
         trb $D030
-	;; and DMA audio
-	lda #$00
-	sta $d711
+        ;; and DMA audio
+        lda #$00
+        sta $d711
 
         ;; Freeze to slot 0
-	tax ;;   <- uses $00 in A from above
-	tay ;;   <- uses $00 in A from above
+        tax ;;   <- uses $00 in A from above
+        tay ;;   <- uses $00 in A from above
         jsr freeze_to_slot
 
-	;; Now mark that we are in a system task, so that the freezer can't be frozen
-	jsr task_set_as_system_task
-	
+        ;; Now mark that we are in a system task, so that the freezer can't be frozen
+        jsr task_set_as_system_task
+
         ;; Load freeze program
         jsr attempt_loadcharrom
         jsr attempt_loadc65rom
@@ -316,7 +316,7 @@ non_hypervisor_task:
         lda #>2061
         sta hypervisor_pch
 
-safe_exit_to_loaded_program:	
+safe_exit_to_loaded_program:
         ;; Make $FFD2 vector at $0326 point to an RTS, so that if the freezer
         ;; is built using CC65's C64 profile, the call to $FFD2 to set lower-case mode
         ;; doesn't do something terrible.
diff --git a/src/hyppo/ultimax.asm b/src/hyppo/ultimax.asm
index 989255e8d..fa7d82a94 100644
--- a/src/hyppo/ultimax.asm
+++ b/src/hyppo/ultimax.asm
@@ -1,6 +1,6 @@
 ;; /*  -------------------------------------------------------------------
 ;;     MEGA65 "HYPPOBOOT" Combined boot and hypervisor ROM.
-;;     Paul Gardner-Stephen, 2014-2019.
+;;     Paul Gardner-Stephen, 2014-2024.
 ;;     ---------------------------------------------------------------- */
 reset_cartridge:
         ldz #$00
diff --git a/src/hyppo/virtual_f011.asm b/src/hyppo/virtual_f011.asm
index a7a014a71..d4bde4109 100644
--- a/src/hyppo/virtual_f011.asm
+++ b/src/hyppo/virtual_f011.asm
@@ -1,6 +1,6 @@
 ;; /*  -------------------------------------------------------------------
 ;;     MEGA65 "HYPPOBOOT" Combined boot and hypervisor ROM.
-;;     Paul Gardner-Stephen, 2014-2019.
+;;     Paul Gardner-Stephen, 2014-2024.
 ;;     ---------------------------------------------------------------- */
 
 f011_virtual_read: