From 2e1db7ae38c31e340dabb7592f1db54f6ef361bf Mon Sep 17 00:00:00 2001
From: izydorst <izydorst@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Thu, 28 Aug 2003 20:51:38 +0000
Subject: [PATCH] removed unnecessary __fastcall__s, some minor cleanups

git-svn-id: svn://svn.cc65.org/cc65/trunk@2420 b7a2c559-68d2-44c3-8de9-860c34a00d81
---
 include/geos/gconst.h   |  3 +--
 include/geos/gdisk.h    | 25 ++++++++++++-------------
 include/geos/gdlgbox.h  |  4 +---
 include/geos/gfile.h    | 27 +++++++++++++--------------
 include/geos/ggraph.h   | 16 +++++++---------
 include/geos/gmemory.h  |  2 --
 include/geos/gmenu.h    | 13 ++++++-------
 include/geos/gprocess.h |  1 -
 include/geos/gsprite.h  | 13 ++++++-------
 include/geos/gstruct.h  |  3 +--
 include/geos/gsym.h     |  7 +++----
 include/geos/gsys.h     | 23 +++++++++++------------
 12 files changed, 61 insertions(+), 76 deletions(-)

diff --git a/include/geos/gconst.h b/include/geos/gconst.h
index ab6d559a9..4847c3286 100644
--- a/include/geos/gconst.h
+++ b/include/geos/gconst.h
@@ -1,7 +1,6 @@
 /*
-  GEOS constants, 4-2-99, 18-3-99
+  GEOS constants
 
-  small C version: 25-27.10.99
   reassembled by Maciej 'YTM/Elysium' Witkowiak
 */
 
diff --git a/include/geos/gdisk.h b/include/geos/gdisk.h
index 99d119eb7..6a0ed923e 100644
--- a/include/geos/gdisk.h
+++ b/include/geos/gdisk.h
@@ -1,7 +1,6 @@
 /*
   GEOS functions from disk driver
 
-  ported to small C on 21.12.1999
   by Maciej 'YTM/Elysium' Witkowiak
 */
 
@@ -21,11 +20,11 @@ char __fastcall__ ReadBlock(struct tr_se *myTrSe, char *buffer);
 char __fastcall__ WriteBlock(struct tr_se *myTrSe, const char *buffer);
 char __fastcall__ VerWriteBlock(struct tr_se *myTrSe, const char *buffer);
 
-unsigned __fastcall__ CalcBlksFree(void);
-char __fastcall__ ChkDkGEOS(void);
-char __fastcall__ SetGEOSDisk(void);
-char __fastcall__ NewDisk(void);
-char __fastcall__ OpenDisk(void);
+unsigned CalcBlksFree(void);
+char ChkDkGEOS(void);
+char SetGEOSDisk(void);
+char NewDisk(void);
+char OpenDisk(void);
 
 char __fastcall__ FindBAMBit(struct tr_se *myTrSe);
 char __fastcall__ BlkAlloc(struct tr_se output[], unsigned length);
@@ -35,23 +34,23 @@ char __fastcall__ FreeBlock(struct tr_se *myTrSe);
 struct tr_se __fastcall__ SetNextFree(struct tr_se *myTrSe);
 // above needs (unsigned) casts on both sides of '='
 
-char __fastcall__ GetDirHead(void);
-char __fastcall__ PutDirHead(void);
+char GetDirHead(void);
+char PutDirHead(void);
 void __fastcall__ GetPtrCurDkNm(char *name);
 
-void __fastcall__ EnterTurbo(void);
-void __fastcall__ ExitTurbo(void);
-void __fastcall__ PurgeTurbo(void);
+void EnterTurbo(void);
+void ExitTurbo(void);
+void PurgeTurbo(void);
 
 char __fastcall__ ChangeDiskDevice(char newdev);
 
-/* disk header offsets	*/
+/* disk header offsets i.e. index curDirHead with these	*/
 #define	OFF_TO_BAM	4
 #define	OFF_DISK_NAME	144
 #define	OFF_GS_DTYPE	189
 #define	OFF_OP_TR_SC	171
 #define	OFF_GS_ID	173
-/* disk errors */
+/* disk errors reported in oserrno */
 #define	ANY_FAULT	0xf0
 #define G_EOF		0
 #define	NO_BLOCKS	1
diff --git a/include/geos/gdlgbox.h b/include/geos/gdlgbox.h
index 5bbfa7322..b1433fea4 100644
--- a/include/geos/gdlgbox.h
+++ b/include/geos/gdlgbox.h
@@ -2,14 +2,13 @@
   GEOS dialog box functions
 
   by Maciej 'YTM/Elysium' Witkowiak
-  26.12.1999, 10.03.2000, 17.8.2003
 */
 
 #ifndef	_GDLGBOX_H
 #define _GDLGBOX_H
 
 char __fastcall__ DoDlgBox(const char *dboxstring);
-char __fastcall__ RstrFrmDialogue(void);
+char RstrFrmDialogue(void);
 
 /* These are custom, predefined dialog boxes, I'm sure you'll find them usable
    Most of them show 2 lines of text 						*/
@@ -109,4 +108,3 @@ typedef void dlgBoxStr;
 #define	OFF_DB_1STCMD	7
 
 #endif
-		  
diff --git a/include/geos/gfile.h b/include/geos/gfile.h
index 2d80d0b37..01cbdc522 100644
--- a/include/geos/gfile.h
+++ b/include/geos/gfile.h
@@ -1,7 +1,6 @@
 /*
   GEOS filesystem functions
 
-  ported to small C on 25.12.1999
   by Maciej 'YTM/Elysium' Witkowiak
 */
 
@@ -12,8 +11,8 @@
 #include <geos/gstruct.h>
 #endif
 
-struct filehandle *__fastcall__ Get1stDirEntry(void);
-struct filehandle *__fastcall__ GetNxtDirEntry(void);
+struct filehandle *Get1stDirEntry(void);
+struct filehandle *GetNxtDirEntry(void);
 
 char __fastcall__ FindFTypes(char *buffer, char ftype, char fmaxnum, const char *classtxt);
 
@@ -26,22 +25,22 @@ char __fastcall__ FreeFile(struct tr_se myTable[]);
 char __fastcall__ DeleteFile(const char *fname);
 char __fastcall__ RenameFile(const char *source, const char *target);
 
-char __fastcall__ ReadByte(void);
+char ReadByte(void);
 
 char __fastcall__ FollowChain(struct tr_se *startTrSe, char *buffer);
 char __fastcall__ GetFHdrInfo(struct filehandle *myFile);
 
 char __fastcall__ OpenRecordFile(const char *fname);
-char __fastcall__ CloseRecordFile(void);
-char __fastcall__ NextRecord(void);
-char __fastcall__ PreviousRecord(void);
+char CloseRecordFile(void);
+char NextRecord(void);
+char PreviousRecord(void);
 char __fastcall__ PointRecord(char);
-char __fastcall__ DeleteRecord(void);
-char __fastcall__ InsertRecord(void);
-char __fastcall__ AppendRecord(void);
+char DeleteRecord(void);
+char InsertRecord(void);
+char AppendRecord(void);
 char __fastcall__ ReadRecord(char *buffer, unsigned flength);
 char __fastcall__ WriteRecord(const char *buffer, unsigned flength);
-char __fastcall__ UpdateRecordFile(void);
+char UpdateRecordFile(void);
 
 /* GEOS filetypes */
 #define	NOT_GEOS	0
@@ -72,7 +71,7 @@ char __fastcall__ UpdateRecordFile(void);
 #define	REL		4
 #define	CBM		5
 /* directory offsets */
-/* offsets in dir entry */
+/* offsets in dir entry i.e. index dirEntryBuf with these */
 #define	FRST_FILE_ENTRY	2
 #define	OFF_CFILE_TYPE	0
 #define	OFF_DE_TR_SC	1
@@ -83,7 +82,7 @@ char __fastcall__ UpdateRecordFile(void);
 #define	OFF_YEAR	23
 #define	OFF_SIZE	28
 #define	OFF_NXT_FILE	32
-/* offsets in file header */
+/* offsets in file header i.e. index fileHeader with these */
 #define	O_GHIC_WIDTH	2
 #define	O_GHIC_HEIGHT	3
 #define	O_GHIC_PIC	4
@@ -98,6 +97,6 @@ char __fastcall__ UpdateRecordFile(void);
 #define	O_GH_AUTHOR	97
 #define	O_GHP_DISK	97
 #define	O_GHP_FNAME	117
-#define	O_GHINFO_TXT	0xa0
+#define	O_GHINFO_TXT	160
 
 #endif
diff --git a/include/geos/ggraph.h b/include/geos/ggraph.h
index 70c7006b0..5e5206f22 100644
--- a/include/geos/ggraph.h
+++ b/include/geos/ggraph.h
@@ -1,9 +1,7 @@
 /*
   GEOS graphic (non icon/menu/sprite) functions
 
-  ported to small C on 29.10.1999
   by Maciej 'YTM/Elysium' Witkowiak
-  10,11.03.2000 - updates
 */
 
 #ifndef	_GGRAPH_H
@@ -24,11 +22,11 @@ void __fastcall__ RecoverLine(char y, unsigned xstart, unsigned xend);
 void __fastcall__ VerticalLine(char pattern, char ystart, char yend, unsigned x);
 
 void __fastcall__ InitDrawWindow(struct window *myRectangle);
-void __fastcall__ Rectangle(void);
+void Rectangle(void);
 void __fastcall__ FrameRectangle(char pattern);
-void __fastcall__ InvertRectangle(void);
-void __fastcall__ ImprintRectangle(void);
-void __fastcall__ RecoverRectangle(void);
+void InvertRectangle(void);
+void ImprintRectangle(void);
+void RecoverRectangle(void);
 
 void __fastcall__ DrawLine(char mode, struct window *topBotCoords);
 
@@ -41,7 +39,7 @@ void __fastcall__ PutDecimal(char style, unsigned value, char y, unsigned x);
 
 char __fastcall__ GetCharWidth(char character);
 void __fastcall__ LoadCharSet(struct fontdesc *myFont);
-void __fastcall__ UseSystemFont(void);
+void UseSystemFont(void);
 
 void __fastcall__ BitmapUp(struct iconpic *myIcon);
 void __fastcall__ BitmapClip(char skipl, char skipr, unsigned skiptop,
@@ -87,7 +85,7 @@ void __fastcall__ GraphicsString(char *myGfxString);
 #define COLOR_LIGHTGREEN     	0x0D
 #define COLOR_LIGHTBLUE      	0x0E
 #define COLOR_GRAY3  	       	0x0F
-/* VIC memory banks */
+/* VIC memory banks - lowest 2 bits of cia2base+0 */
 #define	GRBANK0		3
 #define	GRBANK1		2
 #define	GRBANK2		1
@@ -160,7 +158,7 @@ void __fastcall__ GraphicsString(char *myGfxString);
 #define	ST_WR_BACK	0x40
 #define	ST_WR_FORE	0x80
 /* PutDecimal parameters */
-/* leading 0s? */
+/* leading zeros? */
 #define	SET_NOSURPRESS	0
 #define	SET_SURPRESS	0x40
 /* justification */
diff --git a/include/geos/gmemory.h b/include/geos/gmemory.h
index ecfc2fd5e..87be6c1e8 100644
--- a/include/geos/gmemory.h
+++ b/include/geos/gmemory.h
@@ -1,9 +1,7 @@
 /*
   GEOS memory and string functions
 
-  ported to small C on 27.10.1999
   by Maciej 'YTM/Elysium' Witkowiak
-  04.04.2003 - updates
 */
 
 #ifndef	_GMEMORY_H
diff --git a/include/geos/gmenu.h b/include/geos/gmenu.h
index a53c13f36..b579aef5b 100644
--- a/include/geos/gmenu.h
+++ b/include/geos/gmenu.h
@@ -1,8 +1,7 @@
 /*
   GEOS menu and icon functions
 
-  ported to small C on 27.10.1999
-  by Maciej 'YTM/Alliance' Witkowiak
+  by Maciej 'YTM/Elysium' Witkowiak
 */
 
 #ifndef	_GMENU_H
@@ -13,11 +12,11 @@
 #endif
 
 void __fastcall__ DoMenu(struct menu *myMenu);
-void __fastcall__ ReDoMenu(void);
-void __fastcall__ RecoverMenu(void);
-void __fastcall__ RecoverAllMenus(void);
-void __fastcall__ DoPreviousMenu(void);
-void __fastcall__ GotoFirstMenu(void);
+void ReDoMenu(void);
+void RecoverMenu(void);
+void RecoverAllMenus(void);
+void DoPreviousMenu(void);
+void GotoFirstMenu(void);
 
 void __fastcall__ DoIcons(struct icontab *myIconTab);
 
diff --git a/include/geos/gprocess.h b/include/geos/gprocess.h
index 16a13950f..f0c4d60e9 100644
--- a/include/geos/gprocess.h
+++ b/include/geos/gprocess.h
@@ -1,7 +1,6 @@
 /*
   GEOS processes (~multitasking) functions
 
-  ported to small C on 27.10.1999
   by Maciej 'YTM/Elysium' Witkowiak
 */
 
diff --git a/include/geos/gsprite.h b/include/geos/gsprite.h
index dafc9e6d0..4acd37676 100644
--- a/include/geos/gsprite.h
+++ b/include/geos/gsprite.h
@@ -1,17 +1,16 @@
 /*
   GEOS mouse and sprite functions
 
-  ported to small C on 27.10.1999
   by Maciej 'YTM/Elysium' Witkowiak
 */
 
 #ifndef	_GSPRITE_H
 #define _GSPRITE_H
 
-void __fastcall__ StartMouseMode(void);
-void __fastcall__ ClearMouseMode(void);
-void __fastcall__ MouseUp(void);
-void __fastcall__ MouseOff(void);
+void StartMouseMode(void);
+void ClearMouseMode(void);
+void MouseUp(void);
+void MouseOff(void);
 char __fastcall__ IsMseInRegion(struct window *region);
 
 void __fastcall__ DrawSprite(char spritenum, const char *spritepic);
@@ -21,8 +20,8 @@ void __fastcall__ DisablSprite(char spritenum);
 
 void __fastcall__ InitTextPrompt(char height);
 void __fastcall__ PromptOn(struct pixel *position);
-void __fastcall__ PromptOff(void);
-char __fastcall__ GetNextChar(void);
+void PromptOff(void);
+char GetNextChar(void);
 
 /* keyboard constants */
 #define	KEY_F1		1
diff --git a/include/geos/gstruct.h b/include/geos/gstruct.h
index 85e03d317..1b5b95bc1 100644
--- a/include/geos/gstruct.h
+++ b/include/geos/gstruct.h
@@ -1,7 +1,6 @@
 /*
   GEOS structs
 
-  ported to small C on 25-27.10.1999
   by Maciej 'YTM/Elysium' Witkowiak
 */
 
@@ -11,7 +10,7 @@
    e.g. if you have menu defined as TopMenu and you want to change the number of
    menu items use:
     ((struct menu*)&TopMenu)->number=newNumber;
-   This will translate into single lda/sta pair
+   This will be translated into single lda/sta pair
 */
 
 #ifndef _GSTRUCT_H
diff --git a/include/geos/gsym.h b/include/geos/gsym.h
index dd1bcad4c..bd2f981a6 100644
--- a/include/geos/gsym.h
+++ b/include/geos/gsym.h
@@ -1,8 +1,7 @@
 /*
-  GEOS constants reassembled 4-2-99
-  ported to small C 26.8.99, 25-26.10.99
-  Maciej 'YTM/Elysium' Witkowiak
-  ytm@elysium.pl
+  GEOS system addresses and locations
+
+  reassembled by Maciej 'YTM/Elysium' Witkowiak
 */
 
 #ifndef _GSYM_H
diff --git a/include/geos/gsys.h b/include/geos/gsys.h
index 50b36fe53..ff150191d 100644
--- a/include/geos/gsys.h
+++ b/include/geos/gsys.h
@@ -1,29 +1,28 @@
 /*
   GEOS system functions
 
-  ported to small C on 27.10.1999
   by Maciej 'YTM/Elysium' Witkowiak
 */
 
 #ifndef	_GSYS_H
 #define _GSYS_H
 
-void __fastcall__ FirstInit(void);
-void __fastcall__ InitForIO(void);
-void __fastcall__ DoneWithIO(void);
-void __fastcall__ MainLoop(void);
-void __fastcall__ EnterDeskTop(void);
-void __fastcall__ ToBASIC(void);
-void __fastcall__ Panic(void);
+void FirstInit(void);
+void InitForIO(void);
+void DoneWithIO(void);
+void MainLoop(void);
+void EnterDeskTop(void);
+void ToBASIC(void);
+void Panic(void);
 
 void __fastcall__ CallRoutine(void *myRoutine);
 
-unsigned __fastcall__ GetSerialNumber(void);
-char __fastcall__ GetRandom(void);
+unsigned GetSerialNumber(void);
+char GetRandom(void);
 
 void __fastcall__ SetDevice(char newdev);
 
-char __fastcall__ get_ostype(void);
+char get_ostype(void);
 
 /* possible return values of get_ostype, machine and version flags will
    be combined with OR */
@@ -36,7 +35,7 @@ char __fastcall__ get_ostype(void);
 #define GEOS_V20	0x20
 #define WHEELS		0x40	/* only Wheels? */
 
-char __fastcall__ get_tv(void);
+char get_tv(void);
 
 /* possible return values of get_tv, these flags will be combined
    note that columns state can be changed during runtime and get_tv
-- 
2.39.5