CVS: blob/include/blob pcmcia-cis.h,NONE,1.1 Makefile.am,1.23,1.24 pcmcia.h,1.8,1.9

[Stefan E. <se...@us...>]

Update of /cvsroot/blob/blob/include/blob
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27649

Modified Files:
	Makefile.am pcmcia.h 
Added Files:
	pcmcia-cis.h 
Log Message:
PCMCIA CLEANUP
remove CIS definitions from generic pcmcia header


--- NEW FILE: pcmcia-cis.h ---
/**********************************************************************
 * pcmcia-cis.h - CIS tuple definitions for PCMCIA
 *
 * (C) by Stefan Eletzhofer <ste...@el...>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * 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; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

#ifndef INC_PCMCIA_CIS_H
#define INC_PCMCIA_CIS_H 1

/* defines for PCMCIA configuration information */
#define PCMCIA_MAX_TUPEL_SZ		512
#define PCMCIA_MAX_FEATURES		4

#define PCMCIA_MAX_IDENT_CHARS	64
#define PCMCIA_MAX_IDENT_FIELDS	4
#define PCMCIA_MAX_FEATURES		4

#define CISTPL_VERS_1           0x15
#define CISTPL_FUNCID           0x21
#define CISTPL_FUNCE            0x22
#define CISTPL_CONFIG           0x1a

/*
 * CIS Function ID codes
 */
#define CISTPL_FUNCID_MULTI     0x00
#define CISTPL_FUNCID_MEMORY    0x01
#define CISTPL_FUNCID_SERIAL    0x02
#define CISTPL_FUNCID_PARALLEL  0x03
#define CISTPL_FUNCID_FIXED     0x04
#define CISTPL_FUNCID_VIDEO     0x05
#define CISTPL_FUNCID_NETWORK   0x06
#define CISTPL_FUNCID_AIMS      0x07
#define CISTPL_FUNCID_SCSI      0x08

/*
 * Fixed Disk FUNCE codes
 */
#define CISTPL_IDE_INTERFACE    0x01

#define CISTPL_FUNCE_IDE_IFACE  0x01
#define CISTPL_FUNCE_IDE_MASTER 0x02
#define CISTPL_FUNCE_IDE_SLAVE  0x03

/* First feature byte */
#define CISTPL_IDE_SILICON      0x04
#define CISTPL_IDE_UNIQUE       0x08
#define CISTPL_IDE_DUAL         0x10

/* Second feature byte */
#define CISTPL_IDE_HAS_SLEEP    0x01
#define CISTPL_IDE_HAS_STANDBY  0x02
#define CISTPL_IDE_HAS_IDLE     0x04
#define CISTPL_IDE_LOW_POWER    0x08
#define CISTPL_IDE_REG_INHIBIT  0x10
#define CISTPL_IDE_HAS_INDEX    0x20
#define CISTPL_IDE_IOIS16       0x40

#endif

Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/Makefile.am,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Makefile.am	5 Feb 2004 18:07:27 -0000	1.23
+++ Makefile.am	6 Feb 2004 10:32:19 -0000	1.24
@@ -50,6 +50,7 @@
 	param_block.h \
 	partition.h \
 	pcmcia.h \
+	pcmcia-cis.h \
 	reboot.h \
 	serial.h \
 	tar.h \

Index: pcmcia.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/pcmcia.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- pcmcia.h	3 Apr 2003 15:06:28 -0000	1.8
+++ pcmcia.h	6 Feb 2004 10:32:19 -0000	1.9
@@ -21,54 +21,7 @@
 #ifndef BLOB_PCMCIA_H
 #define BLOB_PCMCIA_H 1
 
-/* defines for PCMCIA configuration information */
-#define PCMCIA_MAX_TUPEL_SZ		512
-#define PCMCIA_MAX_FEATURES		4
-
-#define PCMCIA_MAX_IDENT_CHARS	64
-#define PCMCIA_MAX_IDENT_FIELDS	4
-#define PCMCIA_MAX_FEATURES		4
-
-#define CISTPL_VERS_1           0x15
-#define CISTPL_FUNCID           0x21
-#define CISTPL_FUNCE            0x22
-#define CISTPL_CONFIG           0x1a
-
-/*
- * CIS Function ID codes
- */
-#define CISTPL_FUNCID_MULTI     0x00
-#define CISTPL_FUNCID_MEMORY    0x01
-#define CISTPL_FUNCID_SERIAL    0x02
-#define CISTPL_FUNCID_PARALLEL  0x03
-#define CISTPL_FUNCID_FIXED     0x04
-#define CISTPL_FUNCID_VIDEO     0x05
-#define CISTPL_FUNCID_NETWORK   0x06
-#define CISTPL_FUNCID_AIMS      0x07
-#define CISTPL_FUNCID_SCSI      0x08
-
-/*
- * Fixed Disk FUNCE codes
- */
-#define CISTPL_IDE_INTERFACE    0x01
-
-#define CISTPL_FUNCE_IDE_IFACE  0x01
-#define CISTPL_FUNCE_IDE_MASTER 0x02
-#define CISTPL_FUNCE_IDE_SLAVE  0x03
-
-/* First feature byte */
-#define CISTPL_IDE_SILICON      0x04
-#define CISTPL_IDE_UNIQUE       0x08
-#define CISTPL_IDE_DUAL         0x10
-
-/* Second feature byte */
-#define CISTPL_IDE_HAS_SLEEP    0x01
-#define CISTPL_IDE_HAS_STANDBY  0x02
-#define CISTPL_IDE_HAS_IDLE     0x04
-#define CISTPL_IDE_LOW_POWER    0x08
-#define CISTPL_IDE_REG_INHIBIT  0x10
-#define CISTPL_IDE_HAS_INDEX    0x20
-#define CISTPL_IDE_IOIS16       0x40
+#include <blob/pcmcia-cis.h>
 
 /**********************************************************************
  * Arch dependent defines (should be pretty much the same everywhere,