Correcting spaces

diff --git a/libsrc/telemon30/_read.s b/libsrc/telemon30/_read.s
index e8bcc3fd012708d0064e6e70814d6609c47a87e6..ee822f1fdaa3d53d595ef64868630b447dbe7401 100644 (file)
--- a/libsrc/telemon30/_read.s
+++ b/libsrc/telemon30/_read.s
@@ -12,36 +12,30 @@
 ;              int read (int fd, void* buf, unsigned count);
 
 .proc   _read
+       sta     ptr1 ; count
+       stx     ptr1+1 ; count
+       jsr     popax ; get buf
+
+       sta     PTR_READ_DEST
+       stx     PTR_READ_DEST+1
+       sta     ptr2 ; in order to calculate nb of bytes read
+       stx     ptr2+1 ;
        
-       sta                     ptr1 ; count
-       stx                     ptr1+1 ; count
-       jsr                     popax ; get buf
-
-       sta                             PTR_READ_DEST
-       stx                     PTR_READ_DEST+1
-       sta                             ptr2 ; in order to calculate nb of bytes read
-       stx                     ptr2+1 ;
-       
-       ;jsr popax ; fp pointer don't care in this version
+       ; jsr popax ; fp pointer don't care in this version
        
-       lda                     ptr1 ; 
-       ldy                             ptr1+1 ;
+       lda     ptr1 ; 
+       ldy     ptr1+1 ;
        BRK_TELEMON     XFREAD ; calls telemon30 routine
        ;  compute nb of bytes read
-       lda                     PTR_READ_DEST+1
+       lda     PTR_READ_DEST+1
        sec
-       sbc                     ptr2+1
-       tax                             
-       lda                     PTR_READ_DEST
+       sbc     ptr2+1
+       tax                     
+       lda     PTR_READ_DEST
        sec
-       sbc                             ptr2
-       
-
-       
+       sbc     ptr2
        ; Here A and X contains number of bytes read
-       
        rts
-
 .endproc
 
 

diff --git a/libsrc/telemon30/ch376.s b/libsrc/telemon30/ch376.s
index 97245add91f7066654442d56c8f762d1cf192682..460a70052a250dddc19b4eb69cb4475f530302ad 100644 (file)
--- a/libsrc/telemon30/ch376.s
+++ b/libsrc/telemon30/ch376.s
@@ -77,108 +77,107 @@ CH376_DISK_CAPACITY       := $3E
 CH376_DISK_RD_GO               := $55
 
 .proc _ch376_file_close
-       lda     #CH376_FILE_CLOSE
-       sta     CH376_COMMAND
-       jsr     _ch376_wait_response
+       lda     #CH376_FILE_CLOSE
+       sta     CH376_COMMAND
+       jsr     _ch376_wait_response
        rts     
 .endproc
 
 .proc _ch376_seek_file
-       ldx     #CH376_BYTE_LOCATE
-       stx     CH376_COMMAND
-       sta     CH376_DATA
-       sty     CH376_DATA
-       lda     #$00 ; Don't manage 32 bits length
-       sta     CH376_DATA
-       sta     CH376_DATA
-       jsr     _ch376_wait_response
+       ldx     #CH376_BYTE_LOCATE
+       stx     CH376_COMMAND
+       sta     CH376_DATA
+       sty     CH376_DATA
+       lda     #$00 ; Don't manage 32 bits length
+       sta     CH376_DATA
+       sta     CH376_DATA
+       jsr     _ch376_wait_response
        rts
 .endproc
 
 ; void ch376_set_file_name(char *filename)
 .proc _ch376_set_file_name
-       sta             ptr1
-       stx             ptr1+1
-       lda     #CH376_SET_FILE_NAME ;$2f
-       sta     CH376_COMMAND
-       ldy     #0
+       sta     ptr1
+       stx     ptr1+1
+       lda     #CH376_SET_FILE_NAME ;$2f
+       sta     CH376_COMMAND
+       ldy     #0
 loop:
-       lda     (ptr1),y ; replace by bufnom
-       beq     end ; we reached 0 value
-       ;BRK_TELEMON    XMINMA
-       sta     CH376_DATA
+       lda     (ptr1),y ; replace by bufnom
+       beq     end ; we reached 0 value
+       BRK_TELEMON     XMINMA
+       sta     CH376_DATA
        iny
-       cpy     #13 ; because we don't manage longfilename shortname =11
-       bne     loop
+       cpy     #13 ; because we don't manage longfilename shortname =11
+       bne     loop
 end:   
-       sta     CH376_DATA
+       sta     CH376_DATA
        rts
 .endproc 
        
 ; char _ch376_file_open();
        
 .proc _ch376_file_open
-       lda     #CH376_FILE_OPEN ; $32
-       sta     CH376_COMMAND
-       jsr     _ch376_wait_response
-;      ldx #0
+       lda     #CH376_FILE_OPEN ; $32
+       sta     CH376_COMMAND
+       jsr     _ch376_wait_response
        rts
 .endproc 
 
-       ;CMD_GET_FILE_SIZE
+
        
 .proc _ch376_get_file_size
-       lda     #CH376_GET_FILE_SIZE
-       sta     CH376_COMMAND
-       lda     #$68
-       sta     CH376_DATA
-       ; store file leng
-       lda     CH376_DATA
-       sta     tmp1
-       lda     CH376_DATA
-       sta     tmp1+1
-       lda     CH376_DATA
-       sta     tmp2
-       lda     CH376_DATA
-       sta     tmp2+1
+       lda     #CH376_GET_FILE_SIZE
+       sta     CH376_COMMAND
+       lda     #$68
+       sta     CH376_DATA
+       ; store file length 32 bits
+       lda     CH376_DATA
+       sta     tmp1
+       lda     CH376_DATA
+       sta     tmp1+1
+       lda     CH376_DATA
+       sta     tmp2
+       lda     CH376_DATA
+       sta     tmp2+1
        rts
 .endproc 
 
 ; void ch376_reset();
        
 .proc _ch376_reset
-       lda #CH376_RESET_ALL ; 5 
-       sta CH376_COMMAND
+       lda     #CH376_RESET_ALL ; 5 
+       sta     CH376_COMMAND
        ; waiting
-       ldy #0
-       ldx #0
+       ldy     #0
+       ldx     #0
 loop:
        nop
        inx
-       bne loop
+       bne     loop
        iny
-       bne loop
+       bne     loop
        rts
 .endproc 
 
 ; char  ch376_check_exist(char value);
        
 .proc _ch376_check_exist
-       sta tmp1
-       lda #CH376_CHECK_EXIST ; 
-       sta CH376_COMMAND
-       lda tmp1
-       sta CH376_DATA
-       lda CH376_DATA
+       sta     tmp1
+       lda     #CH376_CHECK_EXIST ; 
+       sta     CH376_COMMAND
+       lda     tmp1
+       sta     CH376_DATA
+       lda     CH376_DATA
        rts
 .endproc 
        
 ; char         ch376_ic_get_version(void)
 .proc _ch376_ic_get_version
-       lda #CH376_GET_IC_VER
-       sta CH376_COMMAND
-       ldx #0
-       lda CH376_DATA
+       lda     #CH376_GET_IC_VER
+       sta     CH376_COMMAND
+       ldx     #0
+       lda     CH376_DATA
        rts
 .endproc 
 
@@ -186,45 +185,45 @@ loop:
        
 .proc _ch376_set_usb_mode
 ; CH376_SET_USB_MODE_CODE_USB_HOST_SOF_PACKAGE_AUTOMATICALLY
-       ldx     #CH376_SET_USB_MODE ; $15
-       stx     CH376_COMMAND
-       sta     CH376_DATA
+       ldx     #CH376_SET_USB_MODE ; $15
+       stx     CH376_COMMAND
+       sta     CH376_DATA
        rts
 .endproc 
                
 ;      void ch376_set_bytes_write(int value);
 .proc _ch376_set_bytes_write
-       ldy             #CH376_BYTE_WRITE
-       sty     CH376_COMMAND
-       sta     CH376_DATA
-       stx     CH376_DATA
-       lda     #0
-       sta     CH376_DATA
-       sta     CH376_DATA
-       jsr     _ch376_wait_response
+       ldy     #CH376_BYTE_WRITE
+       sty     CH376_COMMAND
+       sta     CH376_DATA
+       stx     CH376_DATA
+       lda     #0
+       sta     CH376_DATA
+       sta     CH376_DATA
+       jsr     _ch376_wait_response
        rts
 .endproc       
        
 .proc _ch376_set_bytes_read
-       ldy     #CH376_BYTE_READ
-       sty     CH376_COMMAND
+       ldy     #CH376_BYTE_READ
+       sty     CH376_COMMAND
        ; Storing 32 bits value
-       sta     CH376_DATA
-       stx     CH376_DATA
-       lda     #0
-       sta     CH376_DATA
-       sta     CH376_DATA
-       jsr     _ch376_wait_response
+       sta     CH376_DATA
+       stx     CH376_DATA
+       lda     #0
+       sta     CH376_DATA
+       sta     CH376_DATA
+       jsr     _ch376_wait_response
        rts
 .endproc               
 
 ; char         ch376_disk_mount();
 .proc _ch376_disk_mount
-       lda #CH376_DISK_MOUNT ; $31
-       sta CH376_COMMAND
-       jsr _ch376_wait_response
+       lda     #CH376_DISK_MOUNT ; $31
+       sta     CH376_COMMAND
+       jsr     _ch376_wait_response
        ; if we read data value, we have then length of the volume name
-       ldx #0
+       ldx     #0
        rts     
 .endproc 
 
@@ -233,89 +232,87 @@ loop:
 .proc _ch376_wait_response
 ; 1 return 1 if usb controller does not respond
 ; else A contains answer of the controller
-       ldy #$ff
+       ldy     #$ff
 loop3:
-       ldx #$ff ; don't decrease this counter. Because ch376 won't respond if there is a lower value
+       ldx     #$ff ; don't decrease this counter. Because ch376 won't respond if there is a lower value
 loop:
-       lda CH376_COMMAND
-       and #%10000000
-       cmp #128
-       bne no_error
+       lda     CH376_COMMAND
+       and     #%10000000
+       cmp     #128
+       bne     no_error
        dex
-       bne loop
+       bne     loop
        dey
-       bne loop3
+       bne     loop3
        ; error is here
        rts
 no_error:
-       lda #CH376_GET_STATUS
-       sta CH376_COMMAND
-       lda CH376_DATA
+       lda     #CH376_GET_STATUS
+       sta     CH376_COMMAND
+       lda     CH376_DATA
        rts
 .endproc 
 
 .proc _ch376_fread
                ; use ptr1 to count bytes
-       jsr _ch376_set_bytes_read
+       jsr     _ch376_set_bytes_read
 
 continue:      
-       cmp #CH376_USB_INT_DISK_READ  ; something to read
-       beq we_read
-       cmp #CH376_USB_INT_SUCCESS ; finished
-       beq finished 
+       cmp     #CH376_USB_INT_DISK_READ  ; something to read
+       beq     we_read
+       cmp     #CH376_USB_INT_SUCCESS ; finished
+       beq     finished 
        ; TODO  in A : $ff X: $ff
-       lda #0
+       lda     #0
        tax
        rts
 we_read:
-       lda #CH376_RD_USB_DATA0
-       sta CH376_COMMAND
+       lda     #CH376_RD_USB_DATA0
+       sta     CH376_COMMAND
 
-       lda CH376_DATA ; contains length read
-       sta tmp2; Number of bytes to read
+       lda     CH376_DATA ; contains length read
+       sta     tmp2; Number of bytes to read
 
        ldy #0
 loop:
-       lda CH376_DATA ; read the data
-       sta (PTR_READ_DEST),y
+       lda     CH376_DATA ; read the data
+       sta     (PTR_READ_DEST),y
 
        iny
-       cpy tmp2
-       bne loop
+       cpy     tmp2
+       bne     loop
        tya
        clc
-       adc PTR_READ_DEST
-       bcc next
-       inc PTR_READ_DEST+1
+       adc     PTR_READ_DEST
+       bcc     next
+       inc     PTR_READ_DEST+1
 next:
-       sta PTR_READ_DEST
+       sta     PTR_READ_DEST
        
-       lda #CH376_BYTE_RD_GO
-       sta CH376_COMMAND
-       jsr _ch376_wait_response
-       jmp continue
+       lda     #CH376_BYTE_RD_GO
+       sta     CH376_COMMAND
+       jsr     _ch376_wait_response
+       jmp     continue
 finished:
        ; TODO  return bytes read
-       lda tmp1
-
-       ldx tmp1+1
-
+       lda     tmp1
+       ldx     tmp1+1
        rts     
 .endproc       
 
 ; void _ch376_fwrite(void *ptr,int number)
 .proc _ch376_fwrite
-               ; use ptr1 to count bytes
-       sta ptr2
-       stx ptr2+1
+    ; use ptr1 to count bytes
+       sta     ptr2
+       stx     ptr2+1
        
-       jsr popax
-       sta PTR_READ_DEST
-       stx PTR_READ_DEST+1
+       jsr     popax
+       sta     PTR_READ_DEST
+       stx     PTR_READ_DEST+1
        
-       lda ptr2
-       ldx ptr2+1
-       jsr _ch376_set_bytes_write
+       lda     ptr2
+       ldx     ptr2+1
+       jsr     _ch376_set_bytes_write
        ;cmp #CH376_USB_INT_SUCCESS
        ;beq finished
        ;jsr popax
@@ -346,26 +343,7 @@ loop:
        sta CH376_DATA ; read the data
        dec tmp2
        bne loop
-;      dec ptr2
-       ;bne continue3
-       ;dec ptr2+1
-       ;bne continue3
-;continue3
-;      lda ptr2+1
-       ;bne continue2
-       ;lda ptr2
-       ;beq finished
-;continue2     
-;      iny
-;      cpy tmp2
-;      bne loop
-;      tya
-;      clc
-;      adc PTR_READ_DEST
-;      bcc next
-;      inc PTR_READ_DEST+1
-;next:
-;      sta PTR_READ_DEST
+
        
        lda #CH376_BYTE_WR_GO
        sta CH376_COMMAND
@@ -380,8 +358,6 @@ finished:
        rts     
 .endproc       
 
-
-
 .proc _ch376_file_create
        lda     #CH376_FILE_CREATE
        sta     CH376_COMMAND