[BACK]Return to mcbus.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / arch / alpha / mcbus

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/arch/alpha/mcbus/mcbus.c between version 1.6 and 1.7

version 1.6, 1999/04/15 22:19:52 version 1.7, 1999/11/16 18:37:24
Line 54  __KERNEL_RCSID(0, "$NetBSD$");
Line 54  __KERNEL_RCSID(0, "$NetBSD$");
 #include "locators.h"  #include "locators.h"
   
 #define KV(_addr)       ((caddr_t)ALPHA_PHYS_TO_K0SEG((_addr)))  #define KV(_addr)       ((caddr_t)ALPHA_PHYS_TO_K0SEG((_addr)))
   #define MCPCIA_EXISTS(mid, gid) \
           (!badaddr((void *)KV(MCPCIA_BRIDGE_ADDR(gid, mid)), sizeof (u_int32_t)))
   
 extern struct cfdriver mcbus_cd;  extern struct cfdriver mcbus_cd;
   
Line 62  struct mcbus_cpu_busdep mcbus_primary;
Line 64  struct mcbus_cpu_busdep mcbus_primary;
 static int      mcbusmatch __P((struct device *, struct cfdata *, void *));  static int      mcbusmatch __P((struct device *, struct cfdata *, void *));
 static void     mcbusattach __P((struct device *, struct device *, void *));  static void     mcbusattach __P((struct device *, struct device *, void *));
 static int      mcbusprint __P((void *, const char *));  static int      mcbusprint __P((void *, const char *));
 static int      mcbussubmatch __P((struct device *, struct cfdata *, void *));  static int      mcbussbm __P((struct device *, struct cfdata *, void *));
 static char     *mcbus_node_type_str __P((u_int8_t));  static char     *mcbus_node_type_str __P((u_int8_t));
   
 typedef struct {  typedef struct {
Line 98  mcbusprint(aux, cp)
Line 100  mcbusprint(aux, cp)
 }  }
   
 static int  static int
 mcbussubmatch(parent, cf, aux)  mcbussbm(parent, cf, aux)
         struct device *parent;          struct device *parent;
         struct cfdata *cf;          struct cfdata *cf;
         void *aux;          void *aux;
Line 166  mcbusattach(parent, self, aux)
Line 168  mcbusattach(parent, self, aux)
         ta.ma_mid = 1;          ta.ma_mid = 1;
         ta.ma_type = MCBUS_TYPE_MEM;          ta.ma_type = MCBUS_TYPE_MEM;
         mbp->mcbus_types[1] = MCBUS_TYPE_MEM;          mbp->mcbus_types[1] = MCBUS_TYPE_MEM;
         (void) config_found_sm(self, &ta, mcbusprint, mcbussubmatch);          (void) config_found_sm(self, &ta, mcbusprint, mcbussbm);
   
         /*          /*
          * Now find PCI busses.           * Now find PCI busses.
Line 182  mcbusattach(parent, self, aux)
Line 184  mcbusattach(parent, self, aux)
                 ta.ma_gid = MCBUS_GID_FROM_INSTANCE(0);                  ta.ma_gid = MCBUS_GID_FROM_INSTANCE(0);
                 ta.ma_mid = mid;                  ta.ma_mid = mid;
                 ta.ma_type = MCBUS_TYPE_PCI;                  ta.ma_type = MCBUS_TYPE_PCI;
                 /*                  if (MCPCIA_EXISTS(ta.ma_mid, ta.ma_gid)) {
                  * XXX MUST ACTUALLY PROBE FOR MCPCIA!                          (void) config_found_sm(self, &ta, mcbusprint, mcbussbm);
                  */                  }
                 (void) config_found_sm(self, &ta, mcbusprint, mcbussubmatch);  
         }          }
   
         /*          /*
Line 212  mcbusattach(parent, self, aux)
Line 213  mcbusattach(parent, self, aux)
                 ta.ma_mid = mid;                  ta.ma_mid = mid;
                 ta.ma_type = MCBUS_TYPE_CPU;                  ta.ma_type = MCBUS_TYPE_CPU;
                 mbp->mcbus_types[mid] = MCBUS_TYPE_CPU;                  mbp->mcbus_types[mid] = MCBUS_TYPE_CPU;
                 (void) config_found_sm(self, &ta, mcbusprint, mcbussubmatch);                  (void) config_found_sm(self, &ta, mcbusprint, mcbussbm);
 #endif  #endif
         }          }
   

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.7

CVSweb <webmaster@jp.NetBSD.org>