[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[MiNT] [PATCH][3/7] Remove unused header files
Commit message:
Remove unused header files.
Contributed by David Galvez.
diff -r 2707e71a2e08 -r 02bd71aa9747 sys/usb/src.km/udd/storage/portab.h
--- a/sys/usb/src.km/udd/storage/portab.h Sun Apr 26 11:57:19 2015 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,251 +0,0 @@
-/*****************************************************************************/
-/* */
-/* PORTAB.H */
-/* */
-/* Use of this file may make your code compatible with all C compilers */
-/* listed. */
-/* */
-/*****************************************************************************/
-
-/*****************************************************************************/
-/* ENVIRONMENT */
-/*****************************************************************************/
-
-#ifndef __PORTAB_H__
-#define __PORTAB_H__
-
-#define GEMDOS 1 /* Digital Research GEMDOS */
-#define MSDOS 0 /* Microsoft MSDOS */
-#define OS2 0 /* Microsoft OS/2 */
-#define FLEXOS 0 /* Digital Research FlexOS */
-#define UNIX 0 /* Unix Operating System */
-
-#define M68000 1 /* Motorola Processing Unit */
-#define I8086 0 /* Intel Processing Unit */
-
-#define DR_C 0 /* Digital Research C Compiler */
-#define LASER_C 0 /* Laser C Compiler */
-#define LATTICE_C 0 /* Lattice C Compiler */
-#define MW_C 0 /* Mark Williams C Compiler */
-#define TURBO_C 1 /* Turbo C Compiler */
-#define MS_C 0 /* Microsoft C Compiler */
-#define HIGH_C 0 /* Metaware High C Compiler */
-#define PCC 0 /* Portable C-Compiler */
-#define XL_C 0 /* AIX C-Compiler/6000 */
-
-#define GEM1 0x0001 /* ATARI GEM version */
-#define GEM2 0x0002 /* MSDOS GEM 2.x versions */
-#define GEM3 0x0004 /* MSDOS GEM/3 version */
-#define XGEM 0x0100 /* OS/2,FlexOS X/GEM version */
-
-#ifndef GEM
-#if GEMDOS
-#define GEM GEM1 /* GEMDOS default is GEM1 */
-#endif /* GEMDOS */
-
-#if MSDOS
-#define GEM GEM3 /* MSDOS default is GEM3 */
-#endif /* MSDOS */
-
-#if OS2
-#define GEM XGEM /* OS/2 default is X/GEM */
-#endif /* MSDOS */
-
-#if FLEXOS | UNIX
-#define GEM XGEM /* FlexOS default is X/GEM */
-#endif /* FLEXOS */
-#endif /* GEM */
-
-/*****************************************************************************/
-/* STANDARD TYPE DEFINITIONS */
-/*****************************************************************************/
-
-#define BYTE char /* Signed byte */
-#define CHAR char /* Signed byte */
-#define UBYTE unsigned char /* Unsigned byte */
-#define UCHAR unsigned char /* Unsigned byte */
-
-#if 1/*LATTICE_C | PCC | XL_C */
-#define WORD short /* Signed word (16 bits) */
-#define SHORT short /* Signed word (16 bits) */
-#define UWORD unsigned short /* Unsigned word */
-#define USHORT unsigned short /* Signed word (16 bits) */
-#else
-#define WORD int /* Signed word (16 bits) */
-#define SHORT int /* Signed word (16 bits) */
-#define UWORD unsigned int /* Unsigned word */
-#define USHORT unsigned int /* Signed word (16 bits) */
-#endif
-
-#define LONG long /* Signed long (32 bits) */
-#define ULONG unsigned long /* Unsigned long */
-
-#define BOOLEAN WORD /* 2 valued (true/false) */
-#define BOOL BOOLEAN /* 2 valued (true/false) */
-#define bool BOOLEAN
-
-#define FLOAT float /* Single precision float */
-#define DOUBLE double /* Double precision float */
-
-#define INT int /* A machine dependent int */
-#define UINT unsigned int /* A machine dependent uint */
-
-#define REG register /* Register variable */
-#define AUTO auto /* Local to function */
-#define EXTERN extern /* External variable */
-#define LOCAL static /* Local to module */
-#define MLOCAL LOCAL /* Local to module */
-#ifdef GLOBAL
-#undef GLOBAL
-#endif
-#define GLOBAL /* Global variable */
-
-/*****************************************************************************/
-/* COMPILER DEPENDENT DEFINITIONS */
-/*****************************************************************************/
-
-#if GEMDOS /* GEMDOS compilers */
-#if DR_C
-#define void WORD /* DR_C doesn't know void */
-#endif /* DR_C */
-
-#if LASER_C | LATTICE_C | TURBO_C
-#define vqt_font_info vqt_fontinfo /* Wrong GEM binding */
-#define graf_mbox graf_movebox /* Wrong GEM binding */
-#define graf_rubbox graf_rubberbox /* Wrong GEM binding */
-#endif /* LASER_C */
-
-#if MW_C
-#define VOID WORD /* MW_C doesn't know (void *) */
-#endif /* MW_C */
-
-#if LATTICE_C
-#define ADR(A) (LONG)A >> 16, (LONG)A & 0xFFFF
-#else
-#define ADR(A) (WORD)((LONG)A >> 16), (WORD)((LONG)A & 0xFFFF)
-#endif /* LATTICE_C */
-#endif /* GEMDOS */
-
-#if MSDOS | OS2 /* MSDOS or OS2 compilers */
-#define ADR(A) (WORD)((LONG)A & 0xFFFF), (WORD)((LONG)A >> 16)
-#endif /* MSDOS */
-
-#if FLEXOS /* FlexOS compilers */
-#define ADR(A) (WORD)((LONG)A & 0xFFFF), (WORD)((LONG)A >> 16)
-#endif /* FLEXOS */
-
-#if MS_C | TURBO_C | HIGH_C /* ANSI compilers */
-#define ANSI 1
-#define _(params) params /* Parameter checking */
-#else
-#define ANSI 0
-#define _(params) () /* No parameter checking */
-#define const
-#define volatile
-#if DR_C | LASER_C | LATTICE_C | MW_C
-#define size_t UINT
-#endif
-#endif
-
-#if DR_C | LASER_C | LATTICE_C | MW_C | HIGH_C | PCC | XL_C
-#define cdecl
-#define pascal
-#endif
-
-#define CONST const
-#define VOLATILE volatile
-#define CDECL cdecl
-#define PASCAL pascal
-
-#define SIZE_T size_t
-
-#ifndef VOID
-#define VOID void
-#endif
-
-/*****************************************************************************/
-/* OPERATING SYSTEM DEPENDENT DEFINITIONS */
-/*****************************************************************************/
-
-#if GEMDOS | UNIX
-#define NEAR /* Near pointer */
-#define FAR /* Far pointer */
-#define HUGE /* Huge pointer */
-#else
-#if HIGH_C
-#define NEAR _near /* Near pointer */
-#define FAR _far /* Far pointer */
-#define HUGE _huge /* Huge pointer */
-#else
-#define NEAR near /* Near pointer */
-#define FAR far /* Far pointer */
-#define HUGE huge /* Huge pointer */
-#endif /* HIGH_C */
-#endif /* GEMDOS */
-
-#if MSDOS | OS2 | FLEXOS /* MSDOS or OS2 compilers */
-#define FPOFF(a) (UWORD)(a)
-#define FPSEG(a) ((UWORD)((ULONG)(a) >> 16))
-#define MKFP(a,b) ((VOID FAR *)(((ULONG)(a) << 16) | (UWORD)(b)))
-#endif /* MSDOS | OS2 | FLEXOS */
-
-#if FLEXOS /* FlexOS compilers */
-#define main GEMAIN /* Because of X/GEM SRTL */
-#endif /* FLEXOS */
-
-#if GEM & GEM1
-#define appl_bvset(bvdisk, bvhard)
-#define appl_yield() evnt_timer (0, 0)
-#define menu_unregister(mid)
-#define scrp_clear()
-#define xgrf_stepcalc(orgw, orgh, xc, yc, w, h, pcx, pcy, pcnt, pxstep, pystep)
-#define xgrf_2box(xc, yc, w, h, corners, cnt, xstep, ystep, doubled)
-#endif /* GEM1 */
-
-#if GEM & (GEM1 | XGEM)
-#define shel_rdef(lpcmd, lpdir)
-#define shel_wdef(lpcmd, lpdir)
-#endif /* GEM1 | XGEM */
-
-#if GEM & (GEM1 | GEM2)
-#define menu_click(click, setit)
-#define v_copies(handle, count)
-#define v_etext(handle, x, y, string, offsets)
-#define v_orient(handle, orientation)
-#define v_tray(handle, tray)
-#define v_xbit_image(handle, filename, aspect, x_scale, y_scale, h_align, v_align, rotate, background, foreground, xy)\
- v_bit_image (handle, filename, aspect, x_scale, y_scale, h_align, v_align, xy)
-#define vst_ex_load_fonts(handle, select, font_max, font_free)\
- vst_load_fonts (handle, select)
-#endif /* GEM1 | GEM2 */
-
-#if GEM & (GEM2 | GEM3 | XGEM)
-#define fsel_exinput(pipath, pisel, pbutton, plabel)\
- fsel_input (pipath, pisel, pbutton)
-#define wind_new()
-#endif /* GEM2 | GEM3 | XGEM */
-
-/*****************************************************************************/
-/* MISCELLANEOUS DEFINITIONS */
-/*****************************************************************************/
-
-#ifndef FALSE
-#define FALSE ((BOOLEAN)0) /* Function FALSE value */
-#define TRUE ((BOOLEAN)1) /* Function TRUE value */
-#endif
-
-#define FAILURE (-1) /* Function failure return val */
-#define SUCCESS 0 /* Function success return val */
-#define FOREVER for (;;) /* Infinite loop declaration */
-#define EOS '\0' /* End of string value */
-
-#ifndef NULL
-#define NULL 0L /* Null long value */
-#endif
-
-#ifndef EOF
-#define EOF (-1) /* EOF value */
-#endif
-
-#endif /* __PORTAB__ */
-
diff -r 2707e71a2e08 -r 02bd71aa9747 sys/usb/src.km/udd/storage/scsidefs.h
--- a/sys/usb/src.km/udd/storage/scsidefs.h Sun Apr 26 11:57:19 2015 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,292 +0,0 @@
-/****************************************************************************
- *
- * Typen f?r SCSI-Calls in C
- *
- * $Source: /mint/freemint/sys/usb/src.km/udd/storage/scsidefs.h,v $
- *
- * $Revision: 1.2 $
- *
- * $Author: alanh $
- *
- * $Date: 2014/07/16 16:31:55 $
- *
- * $State: Exp $
- *
- *****************************************************************************
- * History:
- *
- * $Log: scsidefs.h,v $
- * Revision 1.2 2014/07/16 16:31:55 alanh
- * Merge usbtos branch to the trunk.
- *
- * This brings in lots of updates, fixes and new features.
- *
- * - USB stack now available for TOS only (requires the usb ACCessory)
- * - New USB mouse driver
- * - SCSIDRV available for TOS only (possibly for FreeMiNT later)
- * - Unicorn USB adapter driver available for TOS only. Others need porting.
- *
- * Thanks to Roger Burrows for his work on bringing some of the USB code
- * out of assembly language and into C too !
- *
- * Revision 1.1.2.1 2014/06/27 15:39:46 alanh
- * Add all my latest USB for TOS updates.
- * Add USB SCSIDRV support files.
- *
- * Needs cleanup and get ready for merge to the trunk soon.
- *
- * Revision 1.8 1996/02/14 11:33:52 Steffen_Engel
- * keine globalen Kommandostrukturen mehr
- *
- * Revision 1.7 1996/01/25 17:53:16 Steffen_Engel
- * Tippfehler bei PARITYERROR korrigiert
- *
- * Revision 1.6 1995/11/28 19:14:14 S_Engel
- * *** empty log message ***
- *
- * Revision 1.5 1995/11/14 22:15:58 S_Engel
- * Kleine Korrekturen
- * aktualisiert auf aktuellen Stand
- *
- * Revision 1.4 1995/10/22 15:43:34 S_Engel
- * Kommentare leicht ?berarbeitet
- *
- * Revision 1.3 1995/10/13 22:30:54 S_Engel
- * GetMsg in Struktur eingef?gt
- *
- * Revision 1.2 1995/10/11 10:21:34 S_Engel
- * Handle als LONG, Disconnect auf Bit4 verlegt
- *
- * Revision 1.1 1995/10/03 12:49:42 S_Engel
- * Initial revision
- *
- *
- ****************************************************************************/
-
-
-#ifndef __SCSIDEFS_H
-#define __SCSIDEFS_H
-
-#include "portab.h"
-/*#include <atarierr.h>*/
-
-/*****************************************************************************
- * Konstanten
- *****************************************************************************/
-#define SCSIRevision 0x0101 /* Version 1.01
- * ACHTUNG:
- * Die Versionsnummer stellt die Unterrevision im
- * Lowbyte dar, die Hauptversion im Highbyte.
- * Klienten m?ssen zur grunds?tzlichen Erkennung
- * eine verwendbaren Revision das Highbyte pr?fen,
- * das Lowbyte lediglich f?r die Verwendung von
- * Erweiterungen eine bestimmten Unterrevision.
- * Siehe auch scsiio.init_scsiio.
- */
-
-#define MAXBUSNO 31 /* maximal m?gliche Busnummer */
-
-#ifdef WIN32
- #define USEASPI
-#endif
-
-/* Konvertierung Intel/Motorola */
-#ifdef USEASPI
-
- #define w2mot(A) (((A&0xff)<<8) + ((A&0xff00)>>8))
- #define l2mot(A) (w2mot((LONG)((WORD)A&0xffff)<<16) + (LONG)w2mot((WORD)((A&0xffff0000)>>16)))
-#else
- #define w2mot(A) (A)
- #define l2mot(A) (A)
-#endif
-
-
-/* SCSI-Fehlermeldungen f?r In und Out */
-
-#define NOSCSIERROR 0L /* Kein Fehler */
-#define SELECTERROR -1L /* Fehler beim Selektieren */
-#define STATUSERROR -2L /* Default-Fehler */
-#define PHASEERROR -3L /* ung?ltige Phase */
-#define BSYERROR -4L /* BSY verloren */
-#define BUSERROR -5L /* Busfehler bei DMA-?bertragung */
-#define TRANSERROR -6L /* Fehler beim DMA-Transfer (nichts ?bertragen) */
-#define FREEERROR -7L /* Bus wird nicht mehr freigegeben */
-#define TIMEOUTERROR -8L /* Timeout */
-#define DATATOOLONG -9L /* Daten f?r ACSI-Softtransfer zu lang */
-#define LINKERROR -10L /* Fehler beim Senden des Linked-Command (ACSI) */
-#define TIMEOUTARBIT -11L /* Timeout bei der Arbitrierung */
-#define PENDINGERROR -12L /* auf diesem handle ist ein Fehler vermerkt */
-#define PARITYERROR -13L /* Transfer verursachte Parity-Fehler */
-
-
-/*****************************************************************************
- * Typen
- *****************************************************************************/
-
-/*
- in portab.h zu definieren:
-
- BYTE : 8 Bit signed (char)
- UBYTE : 8 Bit unsigned (unsigned char)
- UWORD : 16 Bit ganzzahlig positiv (unsigned word)
- ULONG : 32 Bit ganzzahlig positiv (unsigned long)
- WORD : 16 Bit ganzzahlig (word)
- LONG : 32 Bit ganzzahlig (long)
- BOOLEAN : WORD
- TRUE : 1
- FALSE : 0
- DLONG : 64 Bit unsigned
-*/
-
-typedef struct
-{
- ULONG hi;
- ULONG lo;
-} DLONG;
-
-
-typedef struct{
- ULONG BusIds; /* abgearbeitete Busnummern
- * jeder Treiber mu? bei InuireSCSI das
- * mit seiner Busnummer korrespondierende
- * Bit setzen.
- */
- BYTE resrvd[28]; /* f?r Erweiterungen */
-}tPrivate;
-
-typedef WORD *tHandle; /* Zeiger auf BusFeatures */
-
-typedef struct
-{
- tHandle Handle; /* Handle f?r Bus und Ger?t */
- BYTE *Cmd; /* Zeiger auf CmdBlock */
- UWORD CmdLen; /* L?nge des Cmd-Block (f?r ACSI n?tig) */
- void *Buffer; /* Datenpuffer */
- ULONG TransferLen; /* ?bertragungsl?nge */
- BYTE *SenseBuffer; /* Puffer f?r ReqSense (18 Bytes) */
- ULONG Timeout; /* Timeout in 1/200 sec */
- UWORD Flags; /* Bitvektor f?r Ablaufw?nsche */
- #define Disconnect 0x10 /* versuche disconnect */
-
-}tSCSICmd;
-typedef tSCSICmd *tpSCSICmd;
-
-
-typedef struct
-{
- tPrivate Private;
- /* f?r den Treiber, Treiber m?ssen das definierte Format beachten und nutzen,
- * f?r Applikationen ist das interpretieren dieser Parameter untersagt! */
- char BusName[20];
- /* zB 'SCSI', 'ACSI', 'PAK-SCSI' */
- UWORD BusNo;
- /* Nummer, unter der der Bus anzusprechen ist */
- UWORD Features;
- #define cArbit 0x01 /* auf dem Bus wird arbitriert */
- #define cAllCmds 0x02 /* hier k?nnen ale SCSI-Cmds abgesetzt werden */
- #define cTargCtrl 0x04 /* Das Target steuert den Ablauf (so soll's sein!) */
- #define cTarget 0x08 /* auf diesem Bus kann man sich als Target installieren */
- #define cCanDisconnect 0x10 /* Disconnect ist m?glich */
- #define cScatterGather 0x20 /* scatter gather bei virtuellem RAM m?glich */
- /* bis zu 16 Features, die der Bus kann, zB Arbit,
- * Full-SCSI (alle SCSI-Cmds im Gegensatz zu ACSI)
- * Target oder Initiator gesteuert
- * Ein SCSI-Handle ist auch ein Zeiger auf eine Kopie dieser Information!
- */
- ULONG MaxLen;
- /* maximale Transferl?nge auf diesem Bus (in Bytes)
- * entspricht zB bei ACSI der Gr??e des FRB
- */
-}tBusInfo;
-
-typedef struct
-{
- BYTE Private[32];
- DLONG SCSIId;
-}tDevInfo;
-
-
-
-typedef struct ttargethandler
-{
- struct ttargethandler *next;
- BOOLEAN CDECL (*TSel) (WORD bus,
- UWORD CSB,
- UWORD CSD);
- BOOLEAN CDECL (*TCmd) (WORD bus,
- BYTE *Cmd);
- UWORD CDECL (*TCmdLen) (WORD bus,
- UWORD Cmd);
- void CDECL (*TReset) (UWORD bus);
- void CDECL (*TEOP) (UWORD bus);
- void CDECL (*TPErr) (UWORD bus);
- void CDECL (*TPMism) (UWORD bus);
- void CDECL (*TBLoss) (UWORD bus);
- void CDECL (*TUnknownInt) (UWORD bus);
-}tTargetHandler;
-
-typedef tTargetHandler *tpTargetHandler;
-
-typedef BYTE tReqData[18];
-
-typedef struct
-{
- UWORD Version; /* Revision in BCD: $0100 = 1.00 */
-
- /* Routinen als Initiator */
- LONG CDECL (*In) (tpSCSICmd Parms);
- LONG CDECL (*Out) (tpSCSICmd Parms);
-
- LONG CDECL (*InquireSCSI) (WORD what,
- tBusInfo *Info);
- #define cInqFirst 0
- #define cInqNext 1
- LONG CDECL (*InquireBus) (WORD what,
- WORD BusNo,
- tDevInfo *Dev);
-
- LONG CDECL (*CheckDev) (WORD BusNo,
- const DLONG *SCSIId,
- char *Name,
- UWORD *Features);
- LONG CDECL (*RescanBus) (WORD BusNo);
-
-
- LONG CDECL (*Open) (WORD BusNo,
- const DLONG *SCSIId,
- ULONG *MaxLen);
- LONG CDECL (*Close) (tHandle handle);
- LONG CDECL (*Error) (tHandle handle,
- WORD rwflag,
- WORD ErrNo);
- #define cErrRead 0
- #define cErrWrite 1
- #define cErrMediach 0
- #define cErrReset 1
-
- /* Routinen als Target (optional) */
- LONG CDECL (*Install) (WORD bus,
- tpTargetHandler Handler);
- LONG CDECL (*Deinstall) (WORD bus,
- tpTargetHandler Handler);
- LONG CDECL (*GetCmd) (WORD bus,
- BYTE *Cmd);
- LONG CDECL (*SendData) (WORD bus,
- BYTE *Buffer,
- ULONG Len);
- LONG CDECL (*GetData) (WORD bus,
- void *Buffer,
- ULONG Len);
- LONG CDECL (*SendStatus) (WORD bus,
- UWORD Status);
- LONG CDECL (*SendMsg) (WORD bus,
- UWORD Msg);
- LONG CDECL (*GetMsg) (WORD bus,
- UWORD *Msg);
-
- /* globale Variablen (f?r Targetroutinen) */
- tReqData *ReqData;
-}tScsiCall;
-typedef tScsiCall *tpScsiCall;
-
-#endif