patch-2.1.116 linux/include/asm-m68k/machw.h

Next file: linux/include/asm-m68k/pgtable.h
Previous file: linux/include/asm-m68k/keyboard.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.115/linux/include/asm-m68k/machw.h linux/include/asm-m68k/machw.h
@@ -99,7 +99,7 @@
 
 # define via_1         ((*(volatile struct VIA *)VIA1_BAS))
 # define via_2         ((*(volatile struct VIA *)VIA2_BAS))
-# define via1_regp    ((volatile unsigned char *)VIA1_BAS)
+# define via1_regp     ((volatile unsigned char *)VIA1_BAS)
  
 /*
  * OSS/RBV base address 
@@ -111,5 +111,36 @@
 /* move to oss.h?? */
 #define nIFR	0x203
 #define oIFR	0x202
+
+
+/* hardware stuff */
+
+#define MACHW_DECLARE(name)    unsigned name : 1
+#define MACHW_SET(name)                (mac_hw_present.name = 1)
+#define MACHW_PRESENT(name)    (mac_hw_present.name)
+
+struct {
+  /* video hardware */
+  /* sound hardware */
+  /* disk storage interfaces */
+  MACHW_DECLARE(MAC_SCSI_80);     /* Directly mapped NCR5380 */
+  MACHW_DECLARE(MAC_SCSI_96);     /* 53c9[46] */
+  MACHW_DECLARE(MAC_SCSI_96_2);   /* 2nd 53c9[46] Q900 and Q950 */
+  MACHW_DECLARE(IDE);             /* IDE Interface */
+  /* other I/O hardware */
+  MACHW_DECLARE(SCC);             /* Serial Communications Contr. */
+  /* DMA */
+  MACHW_DECLARE(SCSI_DMA);        /* DMA for the NCR5380 */
+  /* real time clocks */
+  MACHW_DECLARE(RTC_CLK);         /* clock chip */
+  /* supporting hardware */
+  MACHW_DECLARE(VIA1);            /* Versatile Interface Ad. 1 */
+  MACHW_DECLARE(VIA2);            /* Versatile Interface Ad. 2 */
+  MACHW_DECLARE(RBV);             /* Versatile Interface Ad. 2+ */
+  /* NUBUS */
+  MACHW_DECLARE(NUBUS);           /* NUBUS */
+} mac_hw_present;
+
+/* extern struct mac_hw_present mac_hw_present; */
 
 #endif /* linux/machw.h */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov