[BACK]Return to config.c CVS log [TXT][DIR] Up to [local] / funnyos / arch / sam7s64

Diff for /funnyos/arch/sam7s64/config.c between version 1.2 and 1.4

version 1.2, 2007/11/09 16:10:07 version 1.4, 2007/11/13 15:41:35
Line 4 
Line 4 
 #include <sys/types.h>  #include <sys/types.h>
 #include <sys/device.h>  #include <sys/device.h>
   
   /* devices' regs that we will touch in config_machineinit() */
   #include <arch/sam7s64/dev/sapmcreg.h>
   
 /*  /*
  * Configuration file for platform (AT91SAM7S64).   * Configuration file for platform (AT91SAM7S64).
  */   */
Line 11 
Line 14 
 /* device drivers */  /* device drivers */
 extern struct driver root_dr;  extern struct driver root_dr;
 extern struct driver cpu_dr;  extern struct driver cpu_dr;
   extern struct driver saapbus_dr;
   
   
 extern void(*putchar)(char);  extern void(*putchar)(char);
Line 25 
Line 29 
 struct attachinfo config_attachinfo[] = {  struct attachinfo config_attachinfo[] = {
         /* child,   parent, pminor, loc,        intrno, flags */          /* child,   parent, pminor, loc,        intrno, flags */
         { "cpu" ,       "root",         0, 0,                   0,      0 },          { "cpu" ,       "root",         0, 0,                   0,      0 },
           { "saapbus","root",     0, 0,                   0,      0 },
         { NULL,         NULL,           0, 0,                   0,  0 }          { NULL,         NULL,           0, 0,                   0,  0 }
 };  };
   
Line 36 
Line 41 
 /* name, driverp, ninstances (should be -1) */  /* name, driverp, ninstances (should be -1) */
         { "root", &root_dr, -1 },          { "root", &root_dr, -1 },
         { "cpu" , &cpu_dr, -1 },          { "cpu" , &cpu_dr, -1 },
           { "saapbus" , &saapbus_dr, -1 },
         { NULL, NULL, 0 }          { NULL, NULL, 0 }
 };  };
   
Line 45 
Line 51 
  */   */
   
 void  void
 config_consinit(void)  config_machineinit(void)
 {  {
         /*          /*
          * Configure putchar, so we can printf messages to the console without fcons.           * Initialize critical devices at startup.
          */           */
         /* putchar = tauart_early_putc; */  
           /* XXX kill magic */
   
           /* enable main oscillator and set 6 Slow Clock cycles to wait for its startup */
           *(uint32_t)(SAPMC_BASE + SAPMC_CKGR_MOR) = (0x0000ff00 & (0x06 << 8)) | 0x00000001;
   
           /* wait main osc. to stabilize.. */
           while (*(uint32_t)(SAPMC_BASE + SAPMC_PMC_SR) & 0x00000001 )
                   ;
   
           /* TODO set PLL */
   //      *(uint32_t)(SAPMC_BASE + SAPMC_PMC_MCKR) =
 }  }
   
   
Legend:
Removed from v.1.2  
changed lines
  Added in v.1.4
CVSweb