Adjusted include file extension to ca65 practice.

2025-02-19 02:30:29 +00:00 · 2018-02-23 16:36:05 +01:00 · 2018-02-23 16:36:05 +01:00 · c89a2ae1ba
commit c89a2ae1ba
parent b84527c8a3
67 changed files with 105 additions and 105 deletions
--- a/apps/Makefile
+++ b/apps/Makefile
@ -44,9 +44,9 @@ $(addsuffix .com,$(TCP)): IP65LIB = ../ip65/ip65_tcp.lib
 $(foreach pgm,$(UDP) $(TCP),$(eval $(pgm): $(pgm).prg $(pgm).bin $(pgm).com))

 INCFILES =\
-  ../inc/common.i \
-  ../inc/commonprint.i \
-  ../inc/net.i
+  ../inc/common.inc \
+  ../inc/commonprint.inc \
+  ../inc/net.inc

 prg: $(addsuffix .prg,$(UDP) $(TCP))

--- a/apps/telnet65.s
+++ b/apps/telnet65.s
@ -1,9 +1,9 @@
 ; minimal telnet implementation (dumb terminal emulation only)

-.include "../inc/common.i"
-.include "../inc/commonprint.i"
-.include "../inc/net.i"
-.include "../inc/error.i"
+.include "../inc/common.inc"
+.include "../inc/commonprint.inc"
+.include "../inc/net.inc"
+.include "../inc/error.inc"

 .export start

--- a/drivers/a2_timer.s
+++ b/drivers/a2_timer.s
@ -6,7 +6,7 @@
 ;
 ; timer_read is meant to return a counter with millisecond resolution

-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export timer_init
 .export timer_read
--- a/drivers/a2filteredinput.s
+++ b/drivers/a2filteredinput.s
@ -9,7 +9,7 @@
 .import print_a

 .include "zeropage.inc"
-.include "../inc/common.i"
+.include "../inc/common.inc"

 allowed_ptr = ptr1

--- a/drivers/a2timer.s
+++ b/drivers/a2timer.s
@ -6,7 +6,7 @@
 ;
 ; timer_read is meant to return a counter with millisecond resolution

-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export timer_init
 .export timer_read
--- a/drivers/atrfilteredinput.s
+++ b/drivers/atrfilteredinput.s
@ -9,7 +9,7 @@
 .import print_a

 .include "zeropage.inc"
-.include "../inc/common.i"
+.include "../inc/common.inc"
 .include "atari.inc"

 allowed_ptr = ptr1
--- a/drivers/atrkernal.s
+++ b/drivers/atrkernal.s
@ -1,4 +1,4 @@
-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export exit_to_basic

--- a/drivers/atrprint.s
+++ b/drivers/atrprint.s
@ -1,5 +1,5 @@
 .include "atari.inc"
-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export print_a
 .export print_a_inverse
--- a/drivers/atrtimer.s
+++ b/drivers/atrtimer.s
@ -4,7 +4,7 @@
 ; 1000 units per second. it doesn't have to be particularly accurate.

 .include "atari.inc"
-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export timer_init
 .export timer_exit
--- a/drivers/c64filteredinput.s
+++ b/drivers/c64filteredinput.s
@ -8,7 +8,7 @@
 .import get_key

 .include "zeropage.inc"
-.include "../inc/common.i"
+.include "../inc/common.inc"

 allowed_ptr = ptr1

--- a/drivers/c64timer.s
+++ b/drivers/c64timer.s
@ -3,7 +3,7 @@
 ; the timer should be a 16-bit counter that's incremented by about
 ; 1000 units per second. it doesn't have to be particularly accurate.

-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export timer_init
 .export timer_read
--- a/drivers/clk_timer.s
+++ b/drivers/clk_timer.s
@ -5,7 +5,7 @@
 ; the timer should be a 16-bit counter that's incremented by about
 ; 1000 units per second. it doesn't have to be particularly accurate.

-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export timer_init
 .export timer_read
--- a/drivers/ethernet.s
+++ b/drivers/ethernet.s
@ -1,6 +1,6 @@
 ; Wrapper for Contiki ethernet driver

-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export eth_init
 .export eth_rx
--- a/drivers/ethernetcombo.s
+++ b/drivers/ethernetcombo.s
@ -1,7 +1,7 @@
 ; Wrapper for combination of Contiki ethernet drivers

 .include "zeropage.inc"
-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export eth_init
 .export eth_rx
--- a/drivers/vic20filteredinput.s
+++ b/drivers/vic20filteredinput.s
@ -8,7 +8,7 @@
 .import get_key

 .include "zeropage.inc"
-.include "../inc/common.i"
+.include "../inc/common.inc"

 allowed_ptr = ptr1

--- a/drivers/vic20timer.s
+++ b/drivers/vic20timer.s
@ -4,7 +4,7 @@
 ; 1000 units per second. it doesn't have to be particularly accurate.
 ; this VIC20 implementation requires the routine timer_vbl_handler be called 60 times per second

-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export timer_init
 .export timer_read
--- a/inc/common.inc
+++ b/inc/common.inc
@ -40,7 +40,7 @@



-; -- LICENSE FOR common.i --
+; -- LICENSE FOR common.inc --
 ; The contents of this file are subject to the Mozilla Public License
 ; Version 1.1 (the "License"); you may not use this file except in
 ; compliance with the License. You may obtain a copy of the License at
--- a/inc/commonprint.inc
+++ b/inc/commonprint.inc
@ -384,7 +384,7 @@ press_a_key_to_continue:



-; -- LICENSE FOR commonprint.i --
+; -- LICENSE FOR commonprint.inc --
 ; The contents of this file are subject to the Mozilla Public License
 ; Version 1.1 (the "License"); you may not use this file except in
 ; compliance with the License. You may obtain a copy of the License at
--- a/inc/error.inc
+++ b/inc/error.inc
@ -13,7 +13,7 @@ KPR_ERROR_DNS_LOOKUP_FAILED             = $A1



-; -- LICENSE FOR error.i --
+; -- LICENSE FOR error.inc --
 ; The contents of this file are subject to the Mozilla Public License
 ; Version 1.1 (the "License"); you may not use this file except in
 ; compliance with the License. You may obtain a copy of the License at
--- a/inc/net.inc
+++ b/inc/net.inc
@ -51,7 +51,7 @@



-; -- LICENSE FOR net.i --
+; -- LICENSE FOR net.inc --
 ; The contents of this file are subject to the Mozilla Public License
 ; Version 1.1 (the "License"); you may not use this file except in
 ; compliance with the License. You may obtain a copy of the License at
--- a/inc/printf.inc
+++ b/inc/printf.inc
@ -46,7 +46,7 @@



-; -- LICENSE FOR printf.i --
+; -- LICENSE FOR printf.inc --
 ; The contents of this file are subject to the Mozilla Public License
 ; Version 1.1 (the "License"); you may not use this file except in
 ; compliance with the License. You may obtain a copy of the License at
--- a/inc/version.inc
+++ b/inc/version.inc
--- a/ip65/arithmetic.s
+++ b/ip65/arithmetic.s
@ -1,7 +1,7 @@
 ; helper routines for arithmetic on 32 bit numbers

 .include "zeropage.inc"
-.include "../inc/common.i"
+.include "../inc/common.inc"


 .bss
--- a/ip65/arp.s
+++ b/ip65/arp.s
@ -1,7 +1,7 @@
 ; ARP address resolution

 .include "zeropage.inc"
-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export arp_init
 .export arp_lookup
--- a/ip65/config.s
+++ b/ip65/config.s
@ -1,7 +1,7 @@
 ; IP configuration defaults
 ; most of these will be overwritten if dhcp is used for configuration

-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export cfg_mac
 .export cfg_ip
--- a/ip65/config_c.s
+++ b/ip65/config_c.s
@ -1,4 +1,4 @@
-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export _cfg_mac
 .export _cfg_ip
--- a/ip65/dhcp.s
+++ b/ip65/dhcp.s
@ -9,8 +9,8 @@

 MAX_DHCP_MESSAGES_SENT = 12     ; timeout after sending 12 messages will be about 15 seconds (1+2+3...)/4

-.include "../inc/common.i"
-.include "../inc/error.i"
+.include "../inc/common.inc"
+.include "../inc/error.inc"

 .export dhcp_init
 .import dhcp_server
--- a/ip65/dhcp_c.s
+++ b/ip65/dhcp_c.s
@ -1,4 +1,4 @@
-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export _dhcp_init

--- a/ip65/dns.s
+++ b/ip65/dns.s
@ -3,8 +3,8 @@
 MAX_DNS_MESSAGES_SENT = 8       ; timeout after sending 8 messages will be about 7 seconds (1+2+3+4+5+6+7+8)/4

 .include "zeropage.inc"
-.include "../inc/common.i"
-.include "../inc/error.i"
+.include "../inc/common.inc"
+.include "../inc/error.inc"

 .export dns_set_hostname
 .export dns_resolve
--- a/ip65/dns_c.s
+++ b/ip65/dns_c.s
@ -1,4 +1,4 @@
-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export _dns_resolve

--- a/ip65/dottedquad.s
+++ b/ip65/dottedquad.s
@ -1,4 +1,4 @@
-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export parse_dotted_quad
 .export dotted_quad_value
--- a/ip65/dottedquad_c.s
+++ b/ip65/dottedquad_c.s
@ -1,4 +1,4 @@
-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export _dotted_quad
 .export _parse_dotted_quad
--- a/ip65/eth.s
+++ b/ip65/eth.s
@ -1,6 +1,6 @@
 ; Common ethernet driver code (independant of host computer or ethernet chipset)

-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export eth_set_broadcast_dest
 .export eth_set_my_mac_src
--- a/ip65/http.s
+++ b/ip65/http.s
@ -4,7 +4,7 @@
 ; other ip65 routines between the http_parse_request & http_get_value else odd things will happen.

 .include "zeropage.inc"
-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export http_parse_request
 .export http_get_value
--- a/ip65/http_c.s
+++ b/ip65/http_c.s
@ -1,4 +1,4 @@
-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export _http_get_value

--- a/ip65/httpd.s
+++ b/ip65/httpd.s
@ -2,8 +2,8 @@
 ; to use - call httpd_start with AX pointing at routine to call for each inbound page

 .include "zeropage.inc"
-.include "../inc/common.i"
-.include "../inc/error.i"
+.include "../inc/common.inc"
+.include "../inc/error.inc"

 HTTPD_TIMEOUT_SECONDS = 5       ; what's the maximum time we let 1 connection be open for?

--- a/ip65/httpd_c.s
+++ b/ip65/httpd_c.s
@ -1,4 +1,4 @@
-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export _httpd_start
 .export _httpd_send_response
--- a/ip65/icmp.s
+++ b/ip65/icmp.s
@ -1,7 +1,7 @@
 ; ICMP implementation

-.include "../inc/common.i"
-.include "../inc/error.i"
+.include "../inc/common.inc"
+.include "../inc/error.inc"

 .export icmp_init
 .export icmp_process
--- a/ip65/icmp_c.s
+++ b/ip65/icmp_c.s
@ -1,4 +1,4 @@
-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export _icmp_ping

--- a/ip65/input_c.s
+++ b/ip65/input_c.s
@ -1,4 +1,4 @@
-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export _abort_key

--- a/ip65/ip.s
+++ b/ip65/ip.s
@ -1,5 +1,5 @@
 .include "zeropage.inc"
-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export ip_init
 .export ip_process
--- a/ip65/ip65.s
+++ b/ip65/ip65.s
@ -1,7 +1,7 @@
 ; ip65 main routines

-.include "../inc/common.i"
-.include "../inc/error.i"
+.include "../inc/common.inc"
+.include "../inc/error.inc"

 .export ip65_init
 .export ip65_process
--- a/ip65/ip65_c.s
+++ b/ip65/ip65_c.s
@ -1,4 +1,4 @@
-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export _ip65_init
 .export _ip65_process
--- a/ip65/parser.s
+++ b/ip65/parser.s
@ -6,7 +6,7 @@
 .export parser_skip_next

 .include "zeropage.inc"
-.include "../inc/common.i"
+.include "../inc/common.inc"

 target_string = ptr1
 search_string = ptr2
--- a/ip65/sntp.s
+++ b/ip65/sntp.s
@ -2,8 +2,8 @@

 MAX_SNTP_MESSAGES_SENT = 8

-.include "../inc/common.i"
-.include "../inc/error.i"
+.include "../inc/common.inc"
+.include "../inc/error.inc"

 .export sntp_ip
 .export sntp_utc_timestamp
--- a/ip65/sntp_c.s
+++ b/ip65/sntp_c.s
@ -1,4 +1,4 @@
-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export _sntp_get_time

--- a/ip65/string_utils.s
+++ b/ip65/string_utils.s
@ -7,7 +7,7 @@
 .importzp acc16

 .include "zeropage.inc"
-.include "../inc/common.i"
+.include "../inc/common.inc"

 target_string = ptr2

--- a/ip65/tcp.s
+++ b/ip65/tcp.s
@ -8,8 +8,8 @@
 MAX_TCP_PACKETS_SENT = 8        ; timeout after sending 8 messages will be about 7 seconds (1+2+3+4+5+6+7+8)/4

 .include "zeropage.inc"
-.include "../inc/common.i"
-.include "../inc/error.i"
+.include "../inc/common.inc"
+.include "../inc/error.inc"

 .import ip65_error

--- a/ip65/tcp_c.s
+++ b/ip65/tcp_c.s
@ -1,4 +1,4 @@
-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export _tcp_listen
 .export _tcp_connect
--- a/ip65/tftp.s
+++ b/ip65/tftp.s
@ -5,8 +5,8 @@ TFTP_MAX_RESENDS = 10
 TFTP_TIMER_MASK  = $F8          ; mask lower two bits, means we wait for 8 x1/4 seconds

 .include "zeropage.inc"
-.include "../inc/common.i"
-.include "../inc/error.i"
+.include "../inc/common.inc"
+.include "../inc/error.inc"

 .export tftp_load_address
 .export tftp_ip
--- a/ip65/timer.s
+++ b/ip65/timer.s
@ -7,7 +7,7 @@
 ;
 ; this is generic timer routines, machine specific code goes in drivers/<machinename>timer.s

-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export timer_timeout
 .import timer_read
--- a/ip65/timer_c.s
+++ b/ip65/timer_c.s
@ -1,4 +1,4 @@
-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export _timer_read
 .export _timer_timeout
--- a/ip65/udp.s
+++ b/ip65/udp.s
@ -1,7 +1,7 @@
 ; UDP (user datagram protocol) functions

-.include "../inc/common.i"
-.include "../inc/error.i"
+.include "../inc/common.inc"
+.include "../inc/error.inc"

 .import ip65_error

--- a/ip65/udp_c.s
+++ b/ip65/udp_c.s
@ -1,4 +1,4 @@
-.include "../inc/common.i"
+.include "../inc/common.inc"

 .export _udp_add_listener
 .export _udp_remove_listener
--- a/ip65/url.s
+++ b/ip65/url.s
@ -1,8 +1,8 @@
 ; routines for parsing a URL, and downloading an URL

 .include "zeropage.inc"
-.include "../inc/common.i"
-.include "../inc/error.i"
+.include "../inc/common.inc"
+.include "../inc/error.inc"

 TIMEOUT_SECONDS = 15

@ -403,7 +403,7 @@ http_preamble:
  .byte " HTTP/1.0",$0d,$0a
  .byte "User-Agent: IP65/"

-.include "../inc/version.i"
+.include "../inc/version.inc"

  .byte $0d,$0a
  .byte "Connection: close",$0d,$0a
--- a/test/Makefile
+++ b/test/Makefile
@ -68,9 +68,9 @@ $(foreach pgm,$(C_PGM),$(eval $(pgm): $(pgm).xl.com))
 httpd-slotscan.bin: IP65LIB = ../ip65/ip65_tcp.lib

 INCFILES =\
-  ../inc/common.i \
-  ../inc/commonprint.i \
-  ../inc/net.i
+  ../inc/common.inc \
+  ../inc/commonprint.inc \
+  ../inc/net.inc

 prg: $(addsuffix .prg,$(UDP) $(TCP))

--- a/test/dns.s
+++ b/test/dns.s
@ -1,6 +1,6 @@
-.include "../inc/common.i"
-.include "../inc/commonprint.i"
-.include "../inc/net.i"
+.include "../inc/common.inc"
+.include "../inc/commonprint.inc"
+.include "../inc/net.inc"

 .export start

--- a/test/dottedquad.s
+++ b/test/dottedquad.s
@ -1,6 +1,6 @@
-.include "../inc/common.i"
-.include "../inc/commonprint.i"
-.include "../inc/net.i"
+.include "../inc/common.inc"
+.include "../inc/commonprint.inc"
+.include "../inc/net.inc"

 .export start

--- a/test/geturl.s
+++ b/test/geturl.s
@ -1,6 +1,6 @@
-.include "../inc/common.i"
-.include "../inc/commonprint.i"
-.include "../inc/net.i"
+.include "../inc/common.inc"
+.include "../inc/commonprint.inc"
+.include "../inc/net.inc"

 .export start

--- a/test/httpd.s
+++ b/test/httpd.s
@ -1,6 +1,6 @@
-.include "../inc/common.i"
-.include "../inc/commonprint.i"
-.include "../inc/net.i"
+.include "../inc/common.inc"
+.include "../inc/commonprint.inc"
+.include "../inc/net.inc"

 .define HTML "<h1>Hello World</h1><form>Your Name: <input name=n type=text length=20><br>Your Message: <input name=m type=text lengh=60><br><input type=submit></form>"

--- a/test/math.s
+++ b/test/math.s
@ -1,6 +1,6 @@
-.include "../inc/common.i"
-.include "../inc/commonprint.i"
-.include "../inc/net.i"
+.include "../inc/common.inc"
+.include "../inc/commonprint.inc"
+.include "../inc/net.inc"

 .export start

--- a/test/parsequerystring.s
+++ b/test/parsequerystring.s
@ -1,6 +1,6 @@
-.include "../inc/common.i"
-.include "../inc/commonprint.i"
-.include "../inc/net.i"
+.include "../inc/common.inc"
+.include "../inc/commonprint.inc"
+.include "../inc/net.inc"

 .export start

--- a/test/parser.s
+++ b/test/parser.s
@ -1,6 +1,6 @@
-.include "../inc/common.i"
-.include "../inc/commonprint.i"
-.include "../inc/net.i"
+.include "../inc/common.inc"
+.include "../inc/commonprint.inc"
+.include "../inc/net.inc"

 .export start

--- a/test/ping.s
+++ b/test/ping.s
@ -1,6 +1,6 @@
-.include "../inc/common.i"
-.include "../inc/commonprint.i"
-.include "../inc/net.i"
+.include "../inc/common.inc"
+.include "../inc/commonprint.inc"
+.include "../inc/net.inc"

 .export start

--- a/test/sntp.s
+++ b/test/sntp.s
@ -1,6 +1,6 @@
-.include "../inc/common.i"
-.include "../inc/commonprint.i"
-.include "../inc/net.i"
+.include "../inc/common.inc"
+.include "../inc/commonprint.inc"
+.include "../inc/net.inc"

 .export start

--- a/test/tftp.s
+++ b/test/tftp.s
@ -1,6 +1,6 @@
-.include "../inc/common.i"
-.include "../inc/commonprint.i"
-.include "../inc/net.i"
+.include "../inc/common.inc"
+.include "../inc/commonprint.inc"
+.include "../inc/net.inc"

 .export start

--- a/test/vt100.s
+++ b/test/vt100.s
@ -1,5 +1,5 @@
-.include "../inc/common.i"
-.include "../inc/commonprint.i"
+.include "../inc/common.inc"
+.include "../inc/commonprint.inc"

 .export start
 .export telnet_close       = $1000