[Debburn-changes] r432 - in cdrkit/trunk: include libusal/usal
Eduard Bloch
blade at alioth.debian.org
Thu Nov 23 20:03:01 CET 2006
Author: blade
Date: 2006-11-23 20:03:00 +0100 (Thu, 23 Nov 2006)
New Revision: 432
Added:
cdrkit/trunk/include/usal
cdrkit/trunk/libusal/usal/usal/
cdrkit/trunk/libusal/usal/usalcmd.h
cdrkit/trunk/libusal/usal/usalio.h
cdrkit/trunk/libusal/usal/usalops.h
Removed:
cdrkit/trunk/include/scg
cdrkit/trunk/libusal/usal/scg/
cdrkit/trunk/libusal/usal/scgcmd.h
cdrkit/trunk/libusal/usal/scgio.h
cdrkit/trunk/libusal/usal/scgops.h
Log:
Crash and burn, big renaming action, part III
Deleted: cdrkit/trunk/include/scg
===================================================================
--- cdrkit/trunk/include/scg 2006-11-23 18:59:26 UTC (rev 431)
+++ cdrkit/trunk/include/scg 2006-11-23 19:03:00 UTC (rev 432)
@@ -1 +0,0 @@
-link ../libscg/scg
\ No newline at end of file
Added: cdrkit/trunk/include/usal
===================================================================
--- cdrkit/trunk/include/usal 2006-11-23 18:59:26 UTC (rev 431)
+++ cdrkit/trunk/include/usal 2006-11-23 19:03:00 UTC (rev 432)
@@ -0,0 +1 @@
+link ../libusal/usal
\ No newline at end of file
Property changes on: cdrkit/trunk/include/usal
___________________________________________________________________
Name: svn:special
+ *
Deleted: cdrkit/trunk/libusal/usal/scgcmd.h
===================================================================
--- cdrkit/trunk/libusal/usal/scgcmd.h 2006-11-23 18:59:26 UTC (rev 431)
+++ cdrkit/trunk/libusal/usal/scgcmd.h 2006-11-23 19:03:00 UTC (rev 432)
@@ -1,211 +0,0 @@
-/*
- * This file has been modified for the cdrkit suite.
- *
- * The behaviour and appearence of the program code below can differ to a major
- * extent from the version distributed by the original author(s).
- *
- * For details, see Changelog file distributed with the cdrkit package. If you
- * received this file from another source then ask the distributing person for
- * a log of modifications.
- *
- */
-
-/* @(#)usalcmd.h 2.22 04/09/04 Copyright 1986 J. Schilling */
-/*
- * Definitions for the SCSI 'usal_cmd' structure that has been created
- * for the SCSI general driver 'usal' for SunOS and Solaris but
- * now is used for wrapping general libusal SCSI transport requests.
- *
- * Copyright (c) 1986 J. Schilling
- */
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; see the file COPYING. If not, write to the Free Software
- * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef _SCG_SCGCMD_H
-#define _SCG_SCGCMD_H
-
-#include <utypes.h>
-#include <btorder.h>
-
-#if defined(_BIT_FIELDS_LTOH) /* Intel byteorder */
-#else
-# if defined(_BIT_FIELDS_HTOL) /* Motorola byteorder */
-# else
-/*
- * #error will not work for all compilers (e.g. sunos4)
- * The following line will abort compilation on all compilers
- * if none of the above is defines. And that's what we want.
- */
-error One of _BIT_FIELDS_LTOH or _BIT_FIELDS_HTOL must be defined
-# endif
-#endif
-
-#include <usal/scsisense.h>
-#include <usal/scsicdb.h>
-#include <intcvt.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Leave these definitions here if possible to avoid the need to
- * include scsireg.h which makes problems on some OS because these
- * OS define the same types as in scsireg.h
- */
-
-/*
- * SCSI status bits.
- */
-#define ST_VU_00 0x01 /* Vendor unique */
-#define ST_CHK_COND 0x02 /* Check condition */
-#define ST_COND_MET 0x04 /* Condition met */
-#define ST_BUSY 0x08 /* Busy */
-#define ST_IS_SEND 0x10 /* Intermediate status send */
-#define ST_VU_05 0x20 /* Vendor unique */
-#define ST_VU_06 0x40 /* Vendor unique */
-#define ST_RSVD_07 0x80 /* Reserved */
-
-/*
- * Sense key values for extended sense.
- */
-#define SC_NO_SENSE 0x00
-#define SC_RECOVERABLE_ERROR 0x01
-#define SC_NOT_READY 0x02
-#define SC_MEDIUM_ERROR 0x03
-#define SC_HARDWARE_ERROR 0x04
-#define SC_ILLEGAL_REQUEST 0x05
-#define SC_UNIT_ATTENTION 0x06
-#define SC_WRITE_PROTECT 0x07
-#define SC_BLANK_CHECK 0x08
-#define SC_VENDOR_UNIQUE 0x09
-#define SC_COPY_ABORTED 0x0A
-#define SC_ABORTED_COMMAND 0x0B
-#define SC_EQUAL 0x0C
-#define SC_VOLUME_OVERFLOW 0x0D
-#define SC_MISCOMPARE 0x0E
-#define SC_RESERVED 0x0F
-
-/*
- * Messages that SCSI can send.
- */
-#define SC_COMMAND_COMPLETE 0x00
-#define SC_SYNCHRONOUS 0x01
-#define SC_SAVE_DATA_PTR 0x02
-#define SC_RESTORE_PTRS 0x03
-#define SC_DISCONNECT 0x04
-#define SC_ABORT 0x06
-#define SC_MSG_REJECT 0x07
-#define SC_NO_OP 0x08
-#define SC_PARITY 0x09
-#define SC_IDENTIFY 0x80
-#define SC_DR_IDENTIFY 0xc0
-#define SC_DEVICE_RESET 0x0c
-
-#define SC_G0_CDBLEN 6 /* Len of Group 0 commands */
-#define SC_G1_CDBLEN 10 /* Len of Group 1 commands */
-#define SC_G5_CDBLEN 12 /* Len of Group 5 commands */
-
-#define SCG_MAX_CMD 24 /* 24 bytes max. size is supported */
-#define SCG_MAX_STATUS 3 /* XXX (sollte 4 allign.) Mamimum Status Len */
-#define SCG_MAX_SENSE 32 /* Mamimum Sense Len for auto Req. Sense */
-
-#define DEF_SENSE_LEN 16 /* Default Sense Len */
-#define CCS_SENSE_LEN 18 /* Sense Len for CCS compatible devices */
-
-struct usal_cmd {
- caddr_t addr; /* Address of data in user space */
- int size; /* DMA count for data transfer */
- int flags; /* see below for definition */
- int cdb_len; /* Size of SCSI command in bytes */
- /* NOTE: rel 4 uses this field only */
- /* with commands not in group 1 or 2*/
- int sense_len; /* for intr() if -1 don't get sense */
- int timeout; /* timeout in seconds */
- /* NOTE: actual resolution depends */
- /* on driver implementation */
- int kdebug; /* driver kernel debug level */
- int resid; /* Bytes not transfered */
- int error; /* Error code from usalintr() */
- int ux_errno; /* UNIX error code */
-#ifdef comment
-XXX struct scsi_status scb; ??? /* Status returnd by command */
-#endif
- union {
- struct scsi_status Scb; /* Status returnd by command */
- Uchar cmd_scb[SCG_MAX_STATUS];
- } u_scb;
-#define scb u_scb.Scb
-#ifdef comment
-XXX struct scsi_sense sense; ??? /* Sense bytes from command */
-#endif
- union {
- struct scsi_sense Sense; /* Sense bytes from command */
- Uchar cmd_sense[SCG_MAX_SENSE];
- } u_sense;
-#define sense u_sense.Sense
- int sense_count; /* Number of bytes valid in sense */
- int target; /* SCSI target id */
- /* NOTE: The SCSI target id field */
- /* does not need to be filled unless */
- /* the low level transport is a real */
- /* usal driver. In this case the low */
- /* level transport routine of libusal */
- /* will fill in the needed value */
- union { /* SCSI command descriptor block */
- struct scsi_g0cdb g0_cdb;
- struct scsi_g1cdb g1_cdb;
- struct scsi_g5cdb g5_cdb;
- Uchar cmd_cdb[SCG_MAX_CMD];
- } cdb; /* 24 bytes max. size is supported */
-};
-
-#define dma_read flags /* 1 if DMA to Sun, 0 otherwise */
-
-/*
- * definition for flags field in usal_cmd struct
- */
-#define SCG_RECV_DATA 0x0001 /* DMA direction to Sun */
-#define SCG_DISRE_ENA 0x0002 /* enable disconnect/reconnect */
-#define SCG_SILENT 0x0004 /* be silent on errors */
-#define SCG_CMD_RETRY 0x0008 /* enable retries */
-#define SCG_NOPARITY 0x0010 /* disable parity for this command */
-
-/*
- * definition for error field in usal_cmd struct
- *
- * The codes refer to SCSI general errors, not to device
- * specific errors. Device specific errors are discovered
- * by checking the sense data.
- * The distinction between retryable and fatal is somewhat ad hoc.
- */
-#define SCG_NO_ERROR 0 /* cdb transported without error */
- /* SCG_NO_ERROR incudes all commands */
- /* where the SCSI status is valid */
-
-#define SCG_RETRYABLE 1 /* any other case e.g. SCSI bus busy */
- /* SCSI cdb could not be send, */
- /* includes DMA errors other than */
- /* DMA underrun */
-
-#define SCG_FATAL 2 /* could not select target */
-#define SCG_TIMEOUT 3 /* driver timed out */
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _SCG_SCGCMD_H */
Deleted: cdrkit/trunk/libusal/usal/scgio.h
===================================================================
--- cdrkit/trunk/libusal/usal/scgio.h 2006-11-23 18:59:26 UTC (rev 431)
+++ cdrkit/trunk/libusal/usal/scgio.h 2006-11-23 19:03:00 UTC (rev 432)
@@ -1,79 +0,0 @@
-/*
- * This file has been modified for the cdrkit suite.
- *
- * The behaviour and appearence of the program code below can differ to a major
- * extent from the version distributed by the original author(s).
- *
- * For details, see Changelog file distributed with the cdrkit package. If you
- * received this file from another source then ask the distributing person for
- * a log of modifications.
- *
- */
-
-/* @(#)usalio.h 2.16 00/11/07 Copyright 1986 J. Schilling */
-/*
- * Definitions for the SCSI general driver 'usal'
- *
- * Copyright (c) 1986 J. Schilling
- */
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; see the file COPYING. If not, write to the Free Software
- * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef _SCG_SCGIO_H
-#define _SCG_SCGIO_H
-
-#ifndef _SCG_SCGCMD_H
-#include <usal/usalcmd.h>
-#endif
-
-#if defined(SVR4)
-#include <sys/ioccom.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(__STDC__) || defined(SVR4)
-#define SCGIOCMD _IOWR('G', 1, struct usal_cmd) /* do a SCSI cmd */
-#define SCGIORESET _IO('G', 2) /* reset SCSI bus */
-#define SCGIOGDISRE _IOR('G', 4, int) /* get sc disre Val*/
-#define SCGIOSDISRE _IOW('G', 5, int) /* set sc disre Val*/
-#define SCGIOIDBG _IO('G', 100) /* Inc Debug Val */
-#define SCGIODDBG _IO('G', 101) /* Dec Debug Val */
-#define SCGIOGDBG _IOR('G', 102, int) /* get Debug Val */
-#define SCGIOSDBG _IOW('G', 103, int) /* set Debug Val */
-#define SCIOGDBG _IOR('G', 104, int) /* get sc Debug Val*/
-#define SCIOSDBG _IOW('G', 105, int) /* set sc Debug Val*/
-#else
-#define SCGIOCMD _IOWR(G, 1, struct usal_cmd) /* do a SCSI cmd */
-#define SCGIORESET _IO(G, 2) /* reset SCSI bus */
-#define SCGIOGDISRE _IOR(G, 4, int) /* get sc disre Val*/
-#define SCGIOSDISRE _IOW(G, 5, int) /* set sc disre Val*/
-#define SCGIOIDBG _IO(G, 100) /* Inc Debug Val */
-#define SCGIODDBG _IO(G, 101) /* Dec Debug Val */
-#define SCGIOGDBG _IOR(G, 102, int) /* get Debug Val */
-#define SCGIOSDBG _IOW(G, 103, int) /* set Debug Val */
-#define SCIOGDBG _IOR(G, 104, int) /* get sc Debug Val*/
-#define SCIOSDBG _IOW(G, 105, int) /* set sc Debug Val*/
-#endif
-
-#define SCGIO_CMD SCGIOCMD /* backward ccompatibility */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _SCG_SCGIO_H */
Deleted: cdrkit/trunk/libusal/usal/scgops.h
===================================================================
--- cdrkit/trunk/libusal/usal/scgops.h 2006-11-23 18:59:26 UTC (rev 431)
+++ cdrkit/trunk/libusal/usal/scgops.h 2006-11-23 19:03:00 UTC (rev 432)
@@ -1,80 +0,0 @@
-/*
- * This file has been modified for the cdrkit suite.
- *
- * The behaviour and appearence of the program code below can differ to a major
- * extent from the version distributed by the original author(s).
- *
- * For details, see Changelog file distributed with the cdrkit package. If you
- * received this file from another source then ask the distributing person for
- * a log of modifications.
- *
- */
-
-/* @(#)usalops.h 1.5 02/10/19 Copyright 2000 J. Schilling */
-/*
- * Copyright (c) 2000 J. Schilling
- */
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; see the file COPYING. If not, write to the Free Software
- * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef _SCG_SCGOPS_H
-#define _SCG_SCGOPS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct usal_ops {
- int (*usalo_send)(SCSI *usalp);
-
- char * (*usalo_version)(SCSI *usalp, int what);
-#ifdef EOF /* stdio.h has been included */
- int (*usalo_help)(SCSI *usalp, FILE *f);
-#else
- int (*usalo_help)(SCSI *usalp, void *f);
-#endif
- int (*usalo_open)(SCSI *usalp, char *device);
- int (*usalo_close)(SCSI *usalp);
- long (*usalo_maxdma)(SCSI *usalp, long amt);
- void * (*usalo_getbuf)(SCSI *usalp, long amt);
- void (*usalo_freebuf)(SCSI *usalp);
-
-
- BOOL (*usalo_havebus)(SCSI *usalp, int busno);
- int (*usalo_fileno)(SCSI *usalp, int busno, int tgt, int tlun);
- int (*usalo_initiator_id)(SCSI *usalp);
- int (*usalo_isatapi)(SCSI *usalp);
- int (*usalo_reset)(SCSI *usalp, int what);
-} usal_ops_t;
-
-#define SCGO_SEND(usalp) (*(usalp)->ops->usalo_send)(usalp)
-#define SCGO_VERSION(usalp, what) (*(usalp)->ops->usalo_version)(usalp, what)
-#define SCGO_HELP(usalp, f) (*(usalp)->ops->usalo_help)(usalp, f)
-#define SCGO_OPEN(usalp, device) (*(usalp)->ops->usalo_open)(usalp, device)
-#define SCGO_CLOSE(usalp) (*(usalp)->ops->usalo_close)(usalp)
-#define SCGO_MAXDMA(usalp, amt) (*(usalp)->ops->usalo_maxdma)(usalp, amt)
-#define SCGO_GETBUF(usalp, amt) (*(usalp)->ops->usalo_getbuf)(usalp, amt)
-#define SCGO_FREEBUF(usalp) (*(usalp)->ops->usalo_freebuf)(usalp)
-#define SCGO_HAVEBUS(usalp, busno) (*(usalp)->ops->usalo_havebus)(usalp, busno)
-#define SCGO_FILENO(usalp, busno, tgt, tlun) (*(usalp)->ops->usalo_fileno)(usalp, busno, tgt, tlun)
-#define SCGO_INITIATOR_ID(usalp) (*(usalp)->ops->usalo_initiator_id)(usalp)
-#define SCGO_ISATAPI(usalp) (*(usalp)->ops->usalo_isatapi)(usalp)
-#define SCGO_RESET(usalp, what) (*(usalp)->ops->usalo_reset)(usalp, what)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _SCG_SCGOPS_H */
Copied: cdrkit/trunk/libusal/usal/usal (from rev 431, cdrkit/trunk/libusal/usal/scg)
Copied: cdrkit/trunk/libusal/usal/usalcmd.h (from rev 431, cdrkit/trunk/libusal/usal/scgcmd.h)
Copied: cdrkit/trunk/libusal/usal/usalio.h (from rev 431, cdrkit/trunk/libusal/usal/scgio.h)
Copied: cdrkit/trunk/libusal/usal/usalops.h (from rev 431, cdrkit/trunk/libusal/usal/scgops.h)
More information about the Debburn-changes
mailing list