merge/unify chkcpu and freq. wip

[z180-stamp.git] / z180 / cpuinfo.180

diff --git a/z180/cpuinfo.180 b/z180/cpuinfo.180
index 8629aa574d2ee73eb471d3a81bd3738fd79cf23e..372f00393851de4b8570dcb5989763a6a44bcb2a 100644 (file)
--- a/z180/cpuinfo.180
+++ b/z180/cpuinfo.180
@@ -29,53 +29,34 @@ base                equ     0
 \r
 done:  db      0\r
 result:        db      0\r
+cycls: db      0\r
+wstates:db     0\r
 \r
 ;-------------------------------------------------------------------------------\r
-; Read internal register at address in L and IOBASE in H.\r
-;\r
-\r
-reg_in:\r
-       ld      a,h\r
-       add     a,l\r
-       ld      c,a\r
-       ld      b,0\r
-       in      a,(c)\r
-       ret\r
-\r
-;-------------------------------------------------------------------------------\r
-; Write internal register at address in L and IOBASE in H.\r
-;\r
-\r
-reg_out:\r
-       ld      b,a\r
-       ld      a,h\r
-       add     a,l\r
-       ld      c,a\r
-       ld      a,b\r
-       ld      b,0\r
-       out     (c),a\r
-       ret\r
+cyctab:\r
+       db       0      ;Unknown CPU\r
+       db      20      ;8080\r
+       db      20      ;8085\r
+       db      21      ;Z80\r
+       db      19      ;HD64180 or higher\r
+       db      19      ;HD64180\r
+       db      19      ;Z80180\r
+       db      19      ;Z8S180, Z8L180\r
 \r
 ;-------------------------------------------------------------------------------\r
 ; Check if register C exists. D holds mask of bit to test.\r
-;      return nz, if register exists\r
+;      return z, if register exists\r
 \r
 chk_reg:\r
-       call    reg_in\r
-       cp      0ffh\r
-       ret     nz              ;\r
-\r
+       in      a,(c)\r
+       ld      l,a\r
        ; check, if register is changeable\r
-\r
-       xor     d               ; set bit(s) in register to 0\r
-       call    reg_out\r
-       call    reg_in          ; get it back\r
-       ex      af,af'\r
-       ld      a,0ffh          ; set to register original state\r
-       call    reg_out\r
-       ex      af,af'\r
-       cpl\r
-       and     d\r
+       xor     d               ;\r
+       out     (c),a\r
+       in      a,(c)           ; get it back\r
+       xor     d\r
+       out     (c),l           ; set register to original state\r
+       cp      l\r
        ret\r
 \r
 ;-------------------------------------------------------------------------------\r
@@ -142,60 +123,67 @@ chk_z80:
        ; At least Hitachi HD64180\r
        ; Test differences in certain internal registers\r
        ; to determine the 180 variant.\r
-       ; First, search the internal register bank.\r
-\r
-       ld      h,00H           ; I/O Base\r
-find_base_loop:\r
-       ld      l,icr\r
-       call    reg_in\r
-       and     11011111b       ; mask I/O Stop bit\r
-       xor     h\r
+\r
+       ld      a,(wstates)\r
+       out0    (DCNTL),a\r
+       out0    (RCR),b         ;\r
+       in0     a,(icr)\r
        cp      01FH\r
-       jr      nz,nxt_base\r
+       jr      z,icr_ok\r
 \r
        ;TODO: additional plausibility checks\r
 \r
-       jr      z,base_found\r
-nxt_base:\r
-       ld      a,h\r
-       add     a,040H\r
-       ld      h,a\r
-       jr      nc,find_base_loop\r
-       ret                     ;I/O registers not found\r
+       ret                     ; I/O registers not found\r
 \r
        ; Register (base) found.\r
 \r
-base_found:\r
+icr_ok:\r
        inc     e               ; HD64180\r
-       ld      l,omcr          ; Check, if CPU has OMCR register\r
+       ld      c,omcr          ; Check, if CPU has OMCR register\r
        ld      d,M_IOC         ;\r
        call    chk_reg         ;\r
-       ret     z               ; Register does not exist. It's a HD64180\r
+       ret     nz              ; Register does not exist. It's a HD64180\r
 \r
        inc     e               ; Z80180\r
-       ld      l,cmr           ; Check, if CPU has CMR register\r
+       ld      c,cmr           ; Check, if CPU has CMR register\r
        ld      d,M_LNC         ;\r
        call    chk_reg         ;\r
-       ret     z               ; register does not exist. It's a Z80180\r
+       ret     nz              ; register does not exist. It's a Z80180\r
 \r
        inc     e               ; S180/L180 (class) detected.\r
-\r
        ret\r
 \r
 ;-------------------------------------------------------------------------------\r
 \r
 start:\r
        ld      sp,stack\r
+       ld      hl,done\r
+       ld      b,h\r
+       ld      (hl),b\r
+       inc     hl\r
+       ld      (hl),b\r
        call    check\r
-\r
-       ld      hl,result\r
+       ld      hl,cyctab\r
+       ld      d,h\r
+       add     hl,de\r
+       ld      a,(hl)\r
+       ld      hl,cycls\r
+       ld      (hl),a\r
+       dec     hl\r
        ld      (hl),e\r
        dec     hl\r
        ld      (hl),0ffH\r
-       halt\r
-       jp      $-1\r
+       out     (040H),a\r
+                               ;808x   Z80    Z180(0W) Z180(MaxW)\r
+loop:                          ;---------------------------------\r
+       in      a,(050h)        ;10     11       10     +3*3  19\r
+       jp      loop            ;10     10        9     +3*3  18\r
+                               ;---------------------------------\r
+                               ;20     21       19           37\r
+\r
+;      jr      loop            ;--     12        8     +2*3  14\r
 \r
-       rept    8\r
+       rept    4\r
          dw    0\r
        endm\r
 stack:\r