Incorporated another round of feedback for pull request.

Adjusted comment formatting in several assembler files.
Removed dummy kbhit() function, as it's better to get a linker
error than an implementation that does the wrong thing.

diff --git a/doc/osi.sgml b/doc/osi.sgml
index 514ef622e321a3ca7b5ec978a8837e26fdb02c1a..ce2ee48368fd2c5391c1a6cf2442dac74b1df3fe 100644 (file)
--- a/doc/osi.sgml
+++ b/doc/osi.sgml
@@ -139,8 +139,7 @@ There are no loadable drivers available.
 
 <sect1>conio implementation<p>
 
-The conio implementation is complete except for a working kbhit() function. 
-kbhit() currently returns true unconditionally.
+The conio implementation is complete except for a kbhit() function. 
 
 <sect1>stdio implementation<p>
 

diff --git a/libsrc/osic1p/chline.s b/libsrc/osic1p/chline.s
index da07e83be304a60bf8ea820cf8df3b828827b54d..be40d40af6bdfdbd7ec6e3333b2faf12445e17f5 100644 (file)
--- a/libsrc/osic1p/chline.s
+++ b/libsrc/osic1p/chline.s
@@ -22,7 +22,7 @@ _chline:
         cmp     #0              ; Is the length zero?
         beq     L9              ; Jump if done
         sta     tmp1
-L1:     lda     #$94             ; Horizontal line, screen code
+L1:     lda     #$94            ; Horizontal line, screen code
         jsr     cputdirect      ; Direct output
         dec     tmp1
         bne     L1

diff --git a/libsrc/osic1p/clrscr.s b/libsrc/osic1p/clrscr.s
index d2346659b49c1240eba830340b0205beb3b493a2..ee32bf969688731ca40d8f1dc8c277f3606afe71 100644 (file)
--- a/libsrc/osic1p/clrscr.s
+++ b/libsrc/osic1p/clrscr.s
@@ -12,7 +12,7 @@
 BANKS = VIDEORAMSIZE / $100\r
 \r
 _clrscr:\r
-        lda       #$20 ;' '\r
+        lda       #$20          ; ' '\r
         ldy       #BANKS\r
         ldx       #$00\r
 staloc:\r
@@ -22,10 +22,10 @@ staloc:
         inc       staloc+2\r
         dey\r
         bne       staloc\r
-        lda       #>(SCRNBASE); load high byte\r
-        sta       staloc+2    ; restore base address\r
+        lda       #>(SCRNBASE)  ; Load high byte\r
+        sta       staloc+2      ; Restore base address\r
 \r
-        lda       #$00        ; cursor in upper left corner\r
+        lda       #$00          ; Cursor in upper left corner\r
         sta       CURS_X\r
         sta       CURS_Y\r
-        jmp       plot        ; Set the cursor position\r
+        jmp       plot          ; Set the cursor position\r

diff --git a/libsrc/osic1p/crt0.s b/libsrc/osic1p/crt0.s
index 07bdc3689c3a316c64a358dc7cae412407ca3944..657ee27438acb2bd9de913c4fd49d3e56e1bbde8 100644 (file)
--- a/libsrc/osic1p/crt0.s
+++ b/libsrc/osic1p/crt0.s
@@ -7,8 +7,8 @@
 .export   _init, _exit
 .import   _main
 
-.export   __STARTUP__ : absolute = 1        ; Mark as startup
-.import   __RAM_START__, __RAM_SIZE__       ; Linker generated
+.export   __STARTUP__ : absolute = 1    ; Mark as startup
+.import   __RAM_START__, __RAM_SIZE__   ; Linker generated
 
 .import    zerobss, initlib, donelib
 
@@ -24,9 +24,9 @@
 ; ---------------------------------------------------------------------------
 ; A little light 6502 housekeeping
 
-_init:    ldx     #$FF                 ; Initialize stack pointer to $01FF
+_init:    ldx     #$FF          ; Initialize stack pointer to $01FF
           txs
-          cld                          ; Clear decimal mode
+          cld                   ; Clear decimal mode
 
 ; ---------------------------------------------------------------------------
 ; Set cc65 argument stack pointer
@@ -39,8 +39,8 @@ _init:    ldx     #$FF                 ; Initialize stack pointer to $01FF
 ; ---------------------------------------------------------------------------
 ; Initialize memory storage
 
-          jsr     zerobss              ; Clear BSS segment
-          jsr     initlib              ; Run constructors
+          jsr     zerobss       ; Clear BSS segment
+          jsr     initlib       ; Run constructors
 
 ; ---------------------------------------------------------------------------
 ; Call main()
@@ -48,7 +48,7 @@ _init:    ldx     #$FF                 ; Initialize stack pointer to $01FF
           jsr     _main
 
 ; ---------------------------------------------------------------------------
-; Back from main (this is also the _exit entry):  force a software break
+; Back from main (this is also the _exit entry):
 
-_exit:    jsr     donelib              ; Run destructors
-          jmp     RESET                ; Display boot menu after program exit
+_exit:    jsr     donelib       ; Run destructors
+          jmp     RESET         ; Display boot menu after program exit

diff --git a/libsrc/osic1p/cvline.s b/libsrc/osic1p/cvline.s
index c485918eecdb75735e4e878cd3960cb139d9f721..84e5a45bf10692b42292ef53b38bba0a19184363 100644 (file)
--- a/libsrc/osic1p/cvline.s
+++ b/libsrc/osic1p/cvline.s
@@ -21,7 +21,7 @@ _cvline:
         cmp     #0              ; Is the length zero?
         beq     L9              ; Jump if done
         sta     tmp1
-L1:     lda     #$95             ; Vertical bar
+L1:     lda     #$95            ; Vertical bar
         jsr     putchar         ; Write, no cursor advance
         jsr     newline         ; Advance cursor to next line
         dec     tmp1

diff --git a/libsrc/osic1p/kbhit.s b/libsrc/osic1p/kbhit.s
deleted file mode 100644 (file)
index 42db7a5..0000000
--- a/libsrc/osic1p/kbhit.s
+++ /dev/null
@@ -1,11 +0,0 @@
-;
-; int kbhit (void);
-;
-; Currently a dummy function that returns always true
-
-        .export         _kbhit
-
-_kbhit:
-        lda     #$01            ; load low byte with true value
-        ldx     #$00            ; load high byte
-        rts

diff --git a/libsrc/osic1p/osic1p.inc b/libsrc/osic1p/osic1p.inc
index 58d63632f88a51f8fd923367249c3c88deef0208..9a0c346b6756c013196074d652069f68d89d53a6 100644 (file)
--- a/libsrc/osic1p/osic1p.inc
+++ b/libsrc/osic1p/osic1p.inc
@@ -1,9 +1,9 @@
 ; Addresses\r
-SCRNBASE        := $D000    ; Base of video RAM\r
-INPUTC          := $FD00    ; Input character from keyboard\r
-RESET           := $FF00    ; Reset address, show boot prompt\r
+SCRNBASE        := $D000        ; Base of video RAM\r
+INPUTC          := $FD00        ; Input character from keyboard\r
+RESET           := $FF00        ; Reset address, show boot prompt\r
 \r
 ; Other definitions\r
-VIDEORAMSIZE    = $0400     ; Size of C1P video RAM (1 kB)\r
-SCR_LINELEN     = $18       ; screen width - 1\r
-SCR_HEIGHT      = $18       ; screen height - 1\r
+VIDEORAMSIZE    = $0400         ; Size of C1P video RAM (1 kB)\r
+SCR_LINELEN     = $18           ; screen width - 1\r
+SCR_HEIGHT      = $18           ; screen height - 1\r