=================================================================== RCS file: /cvs/funnyos/dev/cpu.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- funnyos/dev/cpu.c 2007/10/29 21:10:02 1.4 +++ funnyos/dev/cpu.c 2007/11/12 13:10:19 1.5 @@ -1,5 +1,5 @@ /* - * $Id: cpu.c,v 1.4 2007/10/29 21:10:02 init Exp $ + * $Id: cpu.c,v 1.5 2007/11/12 13:10:19 nbrk Exp $ */ #include #include @@ -18,41 +18,13 @@ NULL }; -void cpu_identify(struct cpu_dd *); int cpu_attach(struct device *self, uint32_t loc, uint8_t flags) { - struct cpu_dd *ddp = self->dv_devdata; + printf("ARM CPU\n"); - /* identify CPU */ - cpu_identify(ddp); - - - printf("%s CPU at %d MHz (flags=0x%x)\n", ddp->cpu_name, - ddp->cpu_freq, ddp->cpu_flags); - return(0); } - -void -cpu_identify(struct cpu_dd *ddp) -{ - /* - * Identify given CPU using cp15 (System Control Co-Processor) register 0 (ID) - */ - uint32_t rd; - - /* store cp15 ID register into rd */ -// __asm __volatile("mrc p15 0, %0, c0, c0, 0" -// :"=r" (rd)); - - /* parse ID; See the ARM Architecture Reference Manual for details. */ - /* XXX */ - - ddp->cpu_name = "StrongARM SA110"; - ddp->cpu_freq = 233; - ddp->cpu_flags = CPU_HAVE_ICACHE | CPU_HAVE_DCACHE | CPU_HAVE_MMU; -}