Changeset 5a09781f in rtems for c/src/lib/libbsp/m68k/shared/mvme

Timestamp:

09/05/00 15:49:28 (23 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

e5907cfe

Parents:

b00a141

Message:

2000-09-04 Ralf Corsepius <corsepiu@…>

• clock/Makefile.am, console/Makefile.am, consolex/Makefile.am, start/Makefile.am, startup/Makefile.am, timer/Makefile.am, tod/Makefile.am, wrapup/Makefile.am, network/Makefile.am: Include compile.am

File:

• c/src/lib/libbsp/m68k/shared/mvme/mvme16x_hw.h (modified) (4 diffs)

c/src/lib/libbsp/m68k/shared/mvme/mvme16x_hw.h

@@ -205 +205 @@
  */
 typedef volatile struct i82596_regs_ {
-  unsigned short        port_lower;             /* 0xFFF46000 */
-  unsigned short        port_upper;             /* 0xFFF46002 */
-  unsigned long         chan_attn;              /* 0xFFF46004 */
+  unsigned short  port_lower;             /* 0xFFF46000 */
+  unsigned short  port_upper;             /* 0xFFF46002 */
+  unsigned long   chan_attn;              /* 0xFFF46004 */
 } i82596_regs;
 
@@ -213 +213 @@
  *  Base address of the 82596.
  */
+
 #define i82596    ((i82596_regs * const) 0xFFF46000)
 
@@ -218 +219 @@
  *  Representation of initialization data in NVRAM
  */
+
+#if defined(mvme167)
 typedef volatile struct nvram_config_ {
-  unsigned char  dcache_enable;                         /* 0xFFFC0000 */
-  unsigned char  icache_enable;                         /* 0xFFFC0001 */
-  unsigned short cache_mode;                            /* 0xFFFC0002 */
-  unsigned long  ipaddr;                                        /* 0xFFFC0004 */
-  unsigned long  netmask;                                       /* 0xFFFC0008 */
-  unsigned char  enaddr[6];                                     /* 0xFFFC000C */
-  unsigned short processor_id;                          /* 0xFFFC0012 */
-  unsigned long  rma_start;                                     /* 0xFFFC0014 */
-  unsigned long  vma_start;                                     /* 0xFFFC0018 */
-  unsigned long  ramsize;                                       /* 0xFFFC001C */
+  unsigned char   cache_mode;          /* 0xFFFC0000 */
+  unsigned char   console_mode;        /* 0xFFFC0001 */
+  unsigned char   console_printk_port; /* 0xFFFC0002 */
+  unsigned char   pad1;                /* 0xFFFC0003 */
+  unsigned long   ipaddr;              /* 0xFFFC0004 */
+  unsigned long   netmask;             /* 0xFFFC0008 */
+  unsigned char   enaddr[6];           /* 0xFFFC000C */
+  unsigned short  processor_id;        /* 0xFFFC0012 */
+  unsigned long   rma_start;           /* 0xFFFC0014 */
+  unsigned long   vma_start;           /* 0xFFFC0018 */
+  unsigned long   ramsize;             /* 0xFFFC001C */
 } nvram_config;
 
@@ -234 +238 @@
  *  Pointer to the base of User Area NVRAM
  */
-#define nvram                   ((nvram_config * const) 0xFFFC0000)
+
+#define nvram      ((nvram_config * const) 0xFFFC0000)
+
+#endif
+
+
+/*
+ *  Flag to indicate if J1-4 is on (and parameters should be
+ *  sought in User Area NVRAM)
+ */
+
+#if defined(mvme167)
+#define NVRAM_CONFIGURE \
+  ( !( ( (unsigned char)(lcsr->vector_base & 0xFF) ) & 0x10 ) )
+#else
+#define NVRAM_CONFIGURE 0
+#endif