diff --git a/arch/z80/src/z180/z180_io.c b/arch/z80/src/z180/z180_io.c
index 9340413059..ed67f7b773 100644
--- a/arch/z80/src/z180/z180_io.c
+++ b/arch/z80/src/z180/z180_io.c
@@ -55,9 +55,9 @@
 void outp(char p, char c)
 {
   __asm
-	ld	c, 4(ix)	; port
-	ld	a, 5(ix)	; value
-	out	(c), a
+  ld c, 4(ix) ; port
+  ld a, 5(ix) ; value
+  out (c), a
   __endasm;
 }
 
@@ -72,7 +72,7 @@ void outp(char p, char c)
 char inp(char p) __naked
 {
   __asm
-	ld	c, 4(ix)	;port
-	in	l, (c)
+  ld c, 4(ix) ; port
+  in l, (c)
   __endasm;
 }
diff --git a/arch/z80/src/z180/z180_irq.c b/arch/z80/src/z180/z180_irq.c
index 08a00d0131..d419281a4f 100644
--- a/arch/z80/src/z180/z180_irq.c
+++ b/arch/z80/src/z180/z180_irq.c
@@ -74,8 +74,8 @@ extern uintptr_t up_vectors[16];
 static void z180_seti(uint8_t value) __naked
 {
   __asm
-	ld	a, 4(ix)	; value
-	ld	l, a
+  ld a, 4(ix) ; value
+  ld l, a
   __endasm;
 }
 
@@ -94,11 +94,11 @@ static void z180_seti(uint8_t value) __naked
 irqstate_t up_irq_save(void) __naked
 {
   __asm
-	ld		a, i	; AF Parity bit holds interrupt state
-	di				; Interrupts are disabled
-	push	af		; Return AF in HL
-	pop		hl		;
-	ret				;
+  ld a, i ; AF parity bit holds interrupt state
+  di ; interrupts are disabled
+  push af; return AF in HL
+  pop hl ;
+  ret ;
   __endasm;
 }
 
@@ -113,15 +113,15 @@ irqstate_t up_irq_save(void) __naked
 void up_irq_restore(irqstate_t flags) __naked
 {
   __asm
-	di				; Assume disabled
-	pop		hl		; HL = return address
-	pop		af		; AF Parity bit holds interrupt state
-	jp		po, statedisable
-	ei
+  di ; assume disabled
+  pop hl ; HL = return address
+  pop af ; AF parity bit holds interrupt state
+  jp po, statedisable
+  ei
 statedisable:
-	push	af		; Restore stack
-	push	hl		;
-	ret				; and return
+  push af ; restore stack
+  push hl ;
+  ret ; and return
   __endasm;
 }
 
@@ -136,11 +136,11 @@ statedisable:
 irqstate_t up_irq_enable(void) __naked
 {
   __asm
-	ld		a, i	; AF Parity bit holds interrupt state
-	ei				; Interrupts are enabled
-	push	af		; Return AF in HL
-	pop		hl		;
-	ret				;
+  ld a, i ; AF parity bit holds interrupt state
+  ei ; interrupts are enabled
+  push af ; return AF in HL
+  pop hl ;
+  ret ;
   __endasm;
 }
 
diff --git a/arch/z80/src/z180/z180_lowscc.c b/arch/z80/src/z180/z180_lowscc.c
index 2d813f0645..ab7ea30147 100644
--- a/arch/z80/src/z180/z180_lowscc.c
+++ b/arch/z80/src/z180/z180_lowscc.c
@@ -90,13 +90,13 @@ void z180_putc(uint8_t ch) __naked
 {
   __asm
 txbe:
-	in0		a,(CONSOLE_CR)		; Read RR0
-	bit		2, a				; Bit 2, Tx buffer empty?
-	jr		z, txbe				; No, wait until the Tx buffer is empty
+  in0 a, (CONSOLE_CR) ; read RR0
+  bit 2, a ; bit 2, tx buffer empty?
+  jr z, txbe ; no, wait until the tx buffer is empty
 
-	ld		a, 4(ix)			; Character to output
-	out		(CONSOLE_DR), a		; Send it
-	ret
+  ld a, 4(ix) ; character to output
+  out (CONSOLE_DR), a ; send it
+  ret
   __endasm;
 }
 #endif
diff --git a/arch/z80/src/z180/z180_mmu.c b/arch/z80/src/z180/z180_mmu.c
index 9a3ea5e23b..937d5f5a51 100644
--- a/arch/z80/src/z180/z180_mmu.c
+++ b/arch/z80/src/z180/z180_mmu.c
@@ -127,13 +127,13 @@ void z180_mmu_lowinit(void) __naked
    */
 
   __asm
-	ld	c, #Z180_MMU_CBAR		; port
-	ld	a, #Z180_CBAR_VALUE		; value
-	out	(c), a
+  ld c, #Z180_MMU_CBAR ; port
+  ld a, #Z180_CBAR_VALUE ; value
+  out (c), a
 
-	ld	c, #Z180_MMU_BBR		; port
-	ld	a, #Z180_BBR_VALUE		; value
-	out	(c), a
+  ld c, #Z180_MMU_BBR ; port
+  ld a, #Z180_BBR_VALUE ; value
+  out (c), a
   __endasm;
 }
 
diff --git a/arch/z80/src/z80/z80_io.c b/arch/z80/src/z80/z80_io.c
index e8dd895d49..455140ecfc 100644
--- a/arch/z80/src/z80/z80_io.c
+++ b/arch/z80/src/z80/z80_io.c
@@ -56,9 +56,9 @@
 void outp(char p, char c)
 {
   __asm
-	ld	c, 4(ix)	; port
-	ld	a, 5(ix)	; value
-	out	(c), a
+  ld c, 4(ix) ; port
+  ld a, 5(ix) ; value
+  out (c), a
   __endasm;
 }
 
@@ -73,7 +73,7 @@ void outp(char p, char c)
 char inp(char p) __naked
 {
   __asm
-	ld	c, 4(ix)	;port
-	in	l, (c)
+  ld c, 4(ix) ; port
+  in l, (c)
   __endasm;
 }
diff --git a/arch/z80/src/z80/z80_irq.c b/arch/z80/src/z80/z80_irq.c
index 16de7cee44..906990d78d 100644
--- a/arch/z80/src/z80/z80_irq.c
+++ b/arch/z80/src/z80/z80_irq.c
@@ -54,11 +54,11 @@ volatile chipreg_t *g_current_regs;
 irqstate_t up_irq_save(void) __naked
 {
   __asm
-	ld		a, i	; AF Parity bit holds interrupt state
-	di				; Interrupts are disabled
-	push	af		; Return AF in HL
-	pop		hl		;
-	ret				;
+  ld a, i ; AF parity bit holds interrupt state
+  di ; interrupts are disabled
+  push af ; return AF in HL
+  pop hl ;
+  ret ;
   __endasm;
 }
 
@@ -73,15 +73,15 @@ irqstate_t up_irq_save(void) __naked
 void up_irq_restore(irqstate_t flags) __naked
 {
   __asm
-	di				; Assume disabled
-	pop		hl		; HL = return address
-	pop		af		; AF Parity bit holds interrupt state
-	jp		po, statedisable
-	ei
+  di ; assume disabled
+  pop hl ; HL = return address
+  pop af ; AF parity bit holds interrupt state
+  jp po, statedisable
+  ei
 statedisable:
-	push	af		; Restore stack
-	push	hl		;
-	ret				; and return
+  push af ; restore stack
+  push hl ;
+  ret ; and return
   __endasm;
 }
 
@@ -96,10 +96,10 @@ statedisable:
 irqstate_t up_irq_enable(void) __naked
 {
   __asm
-	ld		a, i	; AF Parity bit holds interrupt state
-	ei				; Interrupts are enabled
-	push	af		; Return AF in HL
-	pop		hl		;
-	ret				;
+  ld a, i ; AF parity bit holds interrupt state
+  ei ; interrupts are enabled
+  push af ; return AF in HL
+  pop hl ;
+  ret ;
   __endasm;
 }