From 16d52709b0b2d85bf6630363bcaf30a18e9377c2 Mon Sep 17 00:00:00 2001 From: cpg Date: Thu, 16 Nov 2000 21:27:42 +0000 Subject: [PATCH] dio functions and types now have no leading _ anymore git-svn-id: svn://svn.cc65.org/cc65/trunk@435 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- libsrc/atari/atari.inc | 2 +- libsrc/atari/dio_cts.s | 14 +++++++------- libsrc/atari/diopncls.s | 12 +++++------- libsrc/atari/dioread.s | 10 +++++----- libsrc/atari/diowrite.s | 10 +++++----- libsrc/atari/diowritev.s | 10 +++++----- libsrc/atari/siocall.s | 8 ++++---- 7 files changed, 32 insertions(+), 34 deletions(-) diff --git a/libsrc/atari/atari.inc b/libsrc/atari/atari.inc index 9b732fd18..eaf896ef9 100644 --- a/libsrc/atari/atari.inc +++ b/libsrc/atari/atari.inc @@ -1045,7 +1045,7 @@ sst_size = 4 ; size of one entry ; if changed, adapt diopncls.s ;------------------------------------------------------------------------- -; OFFSETS INTO _dio_phys_pos +; OFFSETS INTO dio_phys_pos ;------------------------------------------------------------------------- diopp_head = 0 ; head diff --git a/libsrc/atari/dio_cts.s b/libsrc/atari/dio_cts.s index d8fb3ac79..a618f5d8b 100644 --- a/libsrc/atari/dio_cts.s +++ b/libsrc/atari/dio_cts.s @@ -8,20 +8,20 @@ ; cylinder and head and returns as sector number the ; sector number it got ; -; unsigned char __fastcall__ _dio_phys_to_log(_dhandle_t handle, -; _dio_phys_pos *physpos, /* input */ -; _sectnum_t *sectnum); /* output */ +; unsigned char __fastcall__ dio_phys_to_log(dhandle_t handle, +; dio_phys_pos *physpos, /* input */ +; sectnum_t *sectnum); /* output */ ; -; _dhandle_t - 16bit (ptr) -; _sectnum_t - 16bit +; dhandle_t - 16bit (ptr) +; sectnum_t - 16bit ; - .export __dio_phys_to_log + .export _dio_phys_to_log .import popax,__oserror .importzp ptr1,ptr2,ptr3 .include "atari.inc" -.proc __dio_phys_to_log +.proc _dio_phys_to_log sta ptr1 stx ptr1+1 ; pointer to result diff --git a/libsrc/atari/diopncls.s b/libsrc/atari/diopncls.s index 504994a72..7826e0cc1 100644 --- a/libsrc/atari/diopncls.s +++ b/libsrc/atari/diopncls.s @@ -7,11 +7,11 @@ ; drive which is later used by the _dio_read and _dio_write ; functions. ; -; _dhandle_t __fastcall__ _dio_open (_driveid_t drive_id); -; unsigned char __fastcall__ _dio_close (_dhandle_t handle); +; dhandle_t __fastcall__ dio_open (driveid_t drive_id); +; unsigned char __fastcall__ dio_close (dhandle_t handle); ; - .export __dio_open,__dio_close + .export _dio_open,_dio_close .export sectsizetab .import __oserror .importzp ptr1,tmp1 @@ -26,7 +26,7 @@ sectsizetab: .code -.proc __dio_open +.proc _dio_open cmp #NUMDRVS ; valid drive id? bcs _inv_drive @@ -64,15 +64,13 @@ _inv_drive: .endproc -.proc __dio_close +.proc _dio_close sta ptr1 stx ptr1+1 lda #0 ldy #sst_flag sta (ptr1),y -; ldy #sst_id -; sta (ptr1),y sta __oserror ; success tax rts ; return no error diff --git a/libsrc/atari/dioread.s b/libsrc/atari/dioread.s index 12d65b300..9cdd18143 100644 --- a/libsrc/atari/dioread.s +++ b/libsrc/atari/dioread.s @@ -3,16 +3,16 @@ ; ; this file provides the _dio_read function ; -; unsigned char __fastcall__ _dio_read(_dhandle_t handle,_sectnum_t sect_num,void *buffer); -; _dhandle_t - 16bit (ptr) -; _sectnum_t - 16bit +; unsigned char __fastcall__ dio_read(dhandle_t handle,sectnum_t sect_num,void *buffer); +; dhandle_t - 16bit (ptr) +; sectnum_t - 16bit ; .import __sio_call,pushax - .export __dio_read + .export _dio_read .include "atari.inc" -.proc __dio_read +.proc _dio_read jsr pushax ; push buffer address ldx #%01000000 ; direction value diff --git a/libsrc/atari/diowrite.s b/libsrc/atari/diowrite.s index 015e880cf..8606d9821 100644 --- a/libsrc/atari/diowrite.s +++ b/libsrc/atari/diowrite.s @@ -3,16 +3,16 @@ ; ; this file provides the _dio_write function ; -; unsigned char __fastcall__ _dio_write(_dhandle_t handle,_sectnum_t sect_num,const void *buffer); -; _dhandle_t - 16bit (ptr) -; _sectnum_t - 16bit +; unsigned char __fastcall__ dio_write(dhandle_t handle,sectnum_t sect_num,const void *buffer); +; dhandle_t - 16bit (ptr) +; sectnum_t - 16bit ; .import __sio_call,pushax - .export __dio_write + .export _dio_write .include "atari.inc" -.proc __dio_write +.proc _dio_write jsr pushax ; push buffer address ldx #%10000000 ; indicate i/o direction (write) diff --git a/libsrc/atari/diowritev.s b/libsrc/atari/diowritev.s index f504455f0..da776b2f2 100644 --- a/libsrc/atari/diowritev.s +++ b/libsrc/atari/diowritev.s @@ -3,16 +3,16 @@ ; ; this file provides the _dio_write function ; -; unsigned char __fastcall__ _dio_write_verify(_dhandle_t handle,_sectnum_t sect_num,const void *buffer); -; _dhandle_t - 16bit (ptr) -; _sectnum_t - 16bit +; unsigned char __fastcall__ dio_write_verify(dhandle_t handle,sectnum_t sect_num,const void *buffer); +; dhandle_t - 16bit (ptr) +; sectnum_t - 16bit ; .import __sio_call,pushax - .export __dio_write_verify + .export _dio_write_verify .include "atari.inc" -.proc __dio_write_verify +.proc _dio_write_verify jsr pushax ; push buffer address ldx #%10000000 ; indicate i/o direction (write) diff --git a/libsrc/atari/siocall.s b/libsrc/atari/siocall.s index 1e6981acc..d0d1b132c 100644 --- a/libsrc/atari/siocall.s +++ b/libsrc/atari/siocall.s @@ -6,12 +6,12 @@ ; generic (e.g. transfer size is fixed), it's used ; to save space with _dio_read and _dio_write functions. ; -; unsigned char __fastcall__ _sio_call(_dhandle_t handle, -; _sectnum_t sect_num, +; unsigned char __fastcall__ _sio_call(dhandle_t handle, +; sectnum_t sect_num, ; void *buffer, ; unsigned int sio_val); -; _dhandle_t - 16bit (ptr) -; _sectnum_t - 16bit +; dhandle_t - 16bit (ptr) +; sectnum_t - 16bit ; sio_val is (sio_command | sio_direction << 8) ; -- 2.39.5