Move include files into /asminc, changed include file paths

git-svn-id: svn://svn.cc65.org/cc65/trunk@1249 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/libsrc/Makefile b/libsrc/Makefile
index 4cf826026b4102dfb82028189f4ec776f5ad97c5..b7fb8001060f5a74d8d2d132c3e455a36cd7b716 100644 (file)
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@ -36,7 +36,7 @@ apple2lib:
            CC=$(CC) \
            AS=$(AS) \
            CFLAGS="-Osir -g -T -t apple2 -I../../include" \
-           AFLAGS="-t apple2" \
+           AFLAGS="-t apple2 -I../../asminc" \
            $(MAKE) -C $$i || exit 1; \
        done
        mv apple2/crt0.o apple2.o
@@ -52,7 +52,7 @@ atarilib:
            CC=$(CC) \
            AS=$(AS) \
            CFLAGS="-Osir -g -T -t atari -I../../include" \
-           AFLAGS="-t atari" \
+           AFLAGS="-t atari -I../../asminc" \
            $(MAKE) -C $$i || exit 1; \
        done
        mv atari/crt0.o atari.o
@@ -68,7 +68,7 @@ c64lib:
            CC=$(CC) \
            AS=$(AS) \
            CFLAGS="-Osir -g -T -t c64 -I../../include" \
-           AFLAGS="-t c64" \
+           AFLAGS="-t c64 -I../../asminc" \
            $(MAKE) -C $$i || exit 1; \
        done
        mv c64/crt0.o c64.o
@@ -84,7 +84,7 @@ c128lib:
            CC=$(CC) \
            AS=$(AS) \
            CFLAGS="-Osir -g -T -t c128 -I../../include" \
-           AFLAGS="-t c128" \
+           AFLAGS="-t c128 -I../../asminc" \
            $(MAKE) -C $$i || exit 1; \
        done
        mv c128/crt0.o c128.o
@@ -100,7 +100,7 @@ cbm510lib:
            CC=$(CC) \
            AS=$(AS) \
            CFLAGS="-Osir -g -T -t cbm510 -I../../include" \
-           AFLAGS="-t cbm510" \
+           AFLAGS="-t cbm510 -I../../asminc" \
            $(MAKE) -C $$i || exit 1; \
        done
        mv cbm510/crt0.o cbm510.o
@@ -116,7 +116,7 @@ cbm610lib:
            CC=$(CC) \
            AS=$(AS) \
            CFLAGS="-Osir -g -T -t cbm610 -I../../include" \
-           AFLAGS="-t cbm610" \
+           AFLAGS="-t cbm610 -I../../asminc" \
            $(MAKE) -C $$i || exit 1; \
        done
        mv cbm610/crt0.o cbm610.o
@@ -132,14 +132,14 @@ geoslib:
        AS=../$(AS) \
        AR=../$(AR) \
        CFLAGS="-Osir -g -T -t geos -I../../../include" \
-       AFLAGS="-t geos" \
+       AFLAGS="-t geos -I../../../asminc" \
        $(MAKE) -C geos || exit 1
        for i in common runtime; do \
            CC=$(CC) \
            AS=$(AS) \
            AR=$(AR) \
            CFLAGS="-Osir -g -T -t geos -I../../include" \
-           AFLAGS="-t geos" \
+           AFLAGS="-t geos -I../../asminc" \
            $(MAKE) -C $$i || exit 1; \
        done
        for i in common runtime; do \
@@ -160,7 +160,7 @@ petlib:
            CC=$(CC) \
            AS=$(AS) \
            CFLAGS="-Osir -g -T -t pet -I../../include" \
-           AFLAGS="-t pet" \
+           AFLAGS="-t pet -I../../asminc" \
            $(MAKE) -C $$i || exit 1; \
        done
        mv pet/crt0.o pet.o
@@ -176,7 +176,7 @@ plus4lib:
            CC=$(CC) \
            AS=$(AS) \
            CFLAGS="-Osir -g -T -t plus4 -I../../include" \
-           AFLAGS="-t plus4" \
+           AFLAGS="-t plus4 -I../../asminc" \
            $(MAKE) -C $$i || exit 1; \
        done
        mv plus4/crt0.o plus4.o
@@ -201,3 +201,4 @@ zap:        clean
 
 
 
+

diff --git a/libsrc/atari/crt0.s b/libsrc/atari/crt0.s
index 685740a349975d59e5aa741ac17ef19e8729a3ec..3c5091f4a466d8ca257331d336eabf9baed31661 100644 (file)
--- a/libsrc/atari/crt0.s
+++ b/libsrc/atari/crt0.s
@@ -19,7 +19,7 @@
        .import         __CODE_LOAD__, __BSS_LOAD__
 
        .include        "atari.inc"
-        .include        "../common/_file.inc"
+        .include        "_file.inc"
 
 ; ------------------------------------------------------------------------
 ; Define and export the ZP variables for the runtime

diff --git a/libsrc/atari/graphics.s b/libsrc/atari/graphics.s
index 1f3d62d6f6a1ab23d7e1f87e7b2e9a6f2ec9810d..e49f018423d7e0c7e1daf43c8cdb315688ca5a08 100644 (file)
--- a/libsrc/atari/graphics.s
+++ b/libsrc/atari/graphics.s
@@ -20,7 +20,7 @@
        .importzp tmp1,tmp2,tmp3
 
        .include        "atari.inc"
-       .include        "../common/errno.inc"
+       .include        "errno.inc"
 
        .code
 

diff --git a/libsrc/atari/lseek.s b/libsrc/atari/lseek.s
index e8e63ef713c962d3c8df0e061b3769374ee073ac..27bc1ad657e61a4118623a6976663b5dc886f663 100644 (file)
--- a/libsrc/atari/lseek.s
+++ b/libsrc/atari/lseek.s
@@ -11,7 +11,7 @@
        .import         incsp6,__errno,__oserror
        .importzp       sreg
        .include        "atari.inc"
-       .include        "../common/errno.inc"
+       .include        "errno.inc"
 
 .proc  _lseek
 

diff --git a/libsrc/atari/open.s b/libsrc/atari/open.s
index 3cf61b58f90bc9c69b06f135085bcdf55e47cebc..f28f8a0324198632d901e478f12588defe3d3c89 100644 (file)
--- a/libsrc/atari/open.s
+++ b/libsrc/atari/open.s
@@ -5,8 +5,8 @@
 ;
 
        .include "atari.inc"
-       .include "../common/fmode.inc"
-       .include "../common/errno.inc"
+       .include "fmode.inc"
+       .include "errno.inc"
        .export _open
        .import clriocb
        .import fddecusage,newfd

diff --git a/libsrc/atari/oserror.s b/libsrc/atari/oserror.s
index b4d0a48accbf5e1674e67cae701c2519c49f8d5f..a2db63d79edaa98bfd0fde65005b7308e24e1323 100644 (file)
--- a/libsrc/atari/oserror.s
+++ b/libsrc/atari/oserror.s
@@ -5,7 +5,7 @@
 ; int __fastcall__ _osmaperrno (unsigned char oserror);
 ;
 
-       .include "../common/errno.inc"
+       .include "errno.inc"
        .export __osmaperrno
 
 .proc  __osmaperrno
@@ -33,7 +33,7 @@ inverr:       lda     #<EUNKNOWN
 .endproc
 
 .rodata
-       
+
 maptable:
        .byte   EINTR   ;BRKABT = 128           ;($80) BREAK key abort
        .byte   EBUSY   ;PRVOPN = 129           ;($81) IOCB already open error

diff --git a/libsrc/atari/remove.s b/libsrc/atari/remove.s
index ddeadf6d7dfb1605a177472c8b9eac00a4f739f3..826cb81c6b1203b3f988c3edb30129cf10521eb5 100644 (file)
--- a/libsrc/atari/remove.s
+++ b/libsrc/atari/remove.s
@@ -5,7 +5,7 @@
 ;
 
        .include "atari.inc"
-       .include "../common/errno.inc"
+       .include "errno.inc"
        .import findfreeiocb,incsp2,__do_oserror
        .import popax,__oserror,__seterrno
        .importzp tmp1

diff --git a/libsrc/atari/rs232.s b/libsrc/atari/rs232.s
index 67fa58a8487f48abb904ba36db404eeb3a4a447e..1c00963cf2d49fc1fac342a6fb3e7f4b33142c1b 100644 (file)
--- a/libsrc/atari/rs232.s
+++ b/libsrc/atari/rs232.s
@@ -28,8 +28,8 @@
        .export         _rs232_put, _rs232_pause, _rs232_unpause, _rs232_status
 
        .include        "atari.inc"
-       .include        "../common/errno.inc"
-        .include        "../common/rs232.inc"
+       .include        "errno.inc"
+        .include        "rs232.inc"
 
        .rodata
 

diff --git a/libsrc/atari/rwcommon.s b/libsrc/atari/rwcommon.s
index 7f77e15a716a140a9d6ec59ce6acddbe62351a73..afdbb443b0d9433c7c911db5f99b72637aa9bbe6 100644 (file)
--- a/libsrc/atari/rwcommon.s
+++ b/libsrc/atari/rwcommon.s
@@ -3,16 +3,16 @@
 ; expects parameters (int fd,void *buf,int count)
 ;
         .include "atari.inc"
-       .include "../common/errno.inc"
+               .include "errno.inc"
         .importzp tmp2,tmp3
         .import incsp6,ldax0sp,ldaxysp
        .import __errno,__oserror
        .import fdtoiocb
-        
+
         .export __rwsetup
 
 __rwsetup:
-       
+
         ldy     #5
         jsr     ldaxysp         ; get fd
        jsr     fdtoiocb        ; convert to iocb
@@ -42,7 +42,7 @@ iocberr:jsr     incsp6          ; pop args
        ldx     #$FF            ; indicate error + clear ZF
        rts
 
-       
+
 ;
 ; this routine updates errno.  do a JMP here right after calling
 ; CIOV.  we expect status in Y.
@@ -50,7 +50,7 @@ iocberr:jsr     incsp6          ; pop args
         .export __do_oserror,__seterrno,__inviocb
 __do_oserror:
        sty     __oserror       ; save os dependent error code
-retminus:      
+retminus:
        lda     #$FF
        tax                     ; return -1
        rts

diff --git a/libsrc/c128/rs232.s b/libsrc/c128/rs232.s
index dd2695facfaef5ec525c0f90ef9fb0262d3a7f76..a2f3a500142a54fbf3f7632f889673220e259547 100644 (file)
--- a/libsrc/c128/rs232.s
+++ b/libsrc/c128/rs232.s
@@ -28,7 +28,7 @@
        .export         _rs232_put, _rs232_pause, _rs232_unpause, _rs232_status
 
        .include        "c128.inc"
-        .include        "../common/rs232.inc"
+        .include        "rs232.inc"
 
 
 NmiExit = $ff33     ;exit address for nmi

diff --git a/libsrc/c64/rs232.s b/libsrc/c64/rs232.s
index c47b359070d8b3c8e38a02a8c80e0409e8b232c6..dc9eb2cb14d78c8dea737138364b253ac1e48d94 100644 (file)
--- a/libsrc/c64/rs232.s
+++ b/libsrc/c64/rs232.s
@@ -28,7 +28,7 @@
        .export         _rs232_put, _rs232_pause, _rs232_unpause, _rs232_status
 
        .include        "c64.inc"
-        .include        "../common/rs232.inc"
+        .include        "rs232.inc"
 
 
 NmiExit = $febc     ;exit address for nmi

diff --git a/libsrc/cbm/oserror.s b/libsrc/cbm/oserror.s
index 0a7ed6e2779d7058cf0be3494262cb7f3f11cea0..15db27f532e1c090ade3968a586ce600bf7241b4 100644 (file)
--- a/libsrc/cbm/oserror.s
+++ b/libsrc/cbm/oserror.s
@@ -6,7 +6,7 @@
 ;
 
        .export         __osmaperrno
-       .include        "../common/errno.inc"
+       .include        "errno.inc"
 
 .code
 

diff --git a/libsrc/common/_file.inc b/libsrc/common/_file.inc
deleted file mode 100644 (file)
index 14a9412..0000000
--- a/libsrc/common/_file.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-;
-; _file.inc
-;
-; (C) Copyright 2002 Ullrich von Bassewitz (uz@cc65.org)
-;
-
-; Assembler include file that makes the constants and structures in _file.h
-; available for asm code.
-
-; Struct _FILE offsets and size
-_FILE_f_fd      = $00
-_FILE_f_flags   = $01
-_FILE_size      = $02
-
-; Flags field 
-_FCLOSED        = $00
-_FOPEN          = $01
-_FEOF           = $02
-_FERROR         = $04
-_FPUSHBACK      = $08
-                     
-; Maximum number of open files (size of table)
-FOPEN_MAX       = 8
-
-; File table
-.global         __filetab
-

diff --git a/libsrc/common/ctype.inc b/libsrc/common/ctype.inc
deleted file mode 100644 (file)
index e8a41da..0000000
--- a/libsrc/common/ctype.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-;
-; Definitions for the character type tables
-;
-; Ullrich von Bassewitz, 08.09.2001
-;
-
-; Make the __ctype table an exported/imported symbol
-
-        .global           __ctype
-
-; Define bitmapped constants for the table entries
-
-CT_LOWER       = $01           ; 0 - Lower case char
-CT_UPPER       = $02           ; 1 - Upper case char
-CT_DIGIT       = $04           ; 2 - Numeric digit
-CT_XDIGIT      = $08           ; 3 - Hex digit (both, lower and upper)
-CT_CTRL                = $10           ; 4 - Control character
-CT_SPACE       = $20           ; 5 - The space character itself
-CT_OTHER_WS    = $40           ; 6 - Other whitespace ('\f', '\n', '\r', '\t' and '\v')
-CT_SPACE_TAB   = $80           ; 7 - Space or tab character
-
-; Combined stuff
-CT_ALNUM       = (CT_LOWER | CT_UPPER | CT_DIGIT)
-CT_ALPHA       = (CT_LOWER | CT_UPPER)
-CT_CTRL_SPACE  = (CT_CTRL | CT_SPACE)
-CT_NOT_PUNCT   = (CT_SPACE | CT_CTRL | CT_DIGIT | CT_UPPER | CT_LOWER)
-
-

diff --git a/libsrc/common/errno.inc b/libsrc/common/errno.inc
deleted file mode 100644 (file)
index 197a355..0000000
--- a/libsrc/common/errno.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-;
-; Ullrich von Bassewitz, 16.05.2000
-;
-
-; Error codes, must match the values in the C headers
-
-ENOENT         =       1       ; No such file or directory
-ENOMEM         =       2       ; Out of memory
-EACCES         =       3       ; Permission denied
-ENODEV         =       4       ; No such device
-EMFILE         =       5       ; Too many open files
-EBUSY          =       6       ; Device or resource busy
-EINVAL         =       7       ; Invalid argument
-ENOSPC         =       8       ; No space left on device
-EEXIST         =       9       ; File exists
-EAGAIN         =       10      ; Try again
-EIO            =       11      ; I/O error
-EINTR          =       12      ; Interrupted system call
-ENOSYS         =       13      ; Function not implemented
-ESPIPE         =       14      ; Illegal seek
-EUNKNOWN               =       15      ; Unknown OS specific error - must be last!
-
-EMAX           =       15      ; Highest error code
-

diff --git a/libsrc/common/fmode.inc b/libsrc/common/fmode.inc
deleted file mode 100644 (file)
index 2ec1090..0000000
--- a/libsrc/common/fmode.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-;
-; Ullrich von Bassewitz, 05.06.1999
-;
-
-; File mode constants, must match the values in the C headers
-
-
-O_RDONLY       = $01
-O_WRONLY       = $02
-O_RDWR         = $03
-O_CREAT                = $04
-O_TRUNC                = $10
-O_APPEND       = $20
-
-

diff --git a/libsrc/common/rs232.inc b/libsrc/common/rs232.inc
deleted file mode 100644 (file)
index fa0089a..0000000
--- a/libsrc/common/rs232.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-;
-; rs232.inc
-;
-; (C) Copyright 2002 Ullrich von Bassewitz (uz@cc65.org)
-;
-
-; Assembler include file that makes the constants and structures from rs232.h
-; available for asm code.
-
-
-
-; Error codes returned by all functions
-RS_ERR_OK                              = $00   ; Not an error - relax
-RS_ERR_NOT_INITIALIZED                 = $01   ; Module not initialized
-RS_ERR_BAUD_TOO_FAST                   = $02   ; Cannot handle baud rate
-RS_ERR_BAUD_NOT_AVAIL                  = $03   ; Baud rate not available
-RS_ERR_NO_DATA                         = $04   ; Nothing to read
-RS_ERR_OVERFLOW                        = $05   ; No room in send buffer
-
-
-

diff --git a/libsrc/geos/devel/oserror.s b/libsrc/geos/devel/oserror.s
index 48ed393179bfa2e4b1a2f2cf89bd0d8d93f8fb35..50dd3279548eaea7f8a364b6f1df4a3034db6c84 100644 (file)
--- a/libsrc/geos/devel/oserror.s
+++ b/libsrc/geos/devel/oserror.s
@@ -8,7 +8,7 @@
 ;
 
        .export         __osmaperrno
-       .include        "../../common/errno.inc"
+       .include        "errno.inc"
        .include        "../inc/const.inc"
 
 .code