From: Andy P. <at...@us...> - 2001-02-18 20:36:48
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel In directory usw-pr-cvs1:/tmp/cvs-serv15546/arch/vax/kernel Modified Files: Makefile cpu_ka46.c Added Files: vax_dev_init.c Log Message: Add vax_dev_init to init/main.c. new file vax_dev_init. Updated cpu_ka46.c Stubbed out checksum routines. --- NEW FILE --- /* vax_dev_init.c * atp Feb 2001 * * Called from initial do_basic_setup in linux/init/main.c * Initialise devices according to mv. * * Add any other vax device specific initialisation stuff here. */ #include <linux/types.h> /* For NULL */ #include <linux/kernel.h> /* For printk */ #include <asm/mtpr.h> #include <asm/mv.h> #include <asm/vaxcpu.h> void vax_dev_init(void) { if (mv->init_devices) { mv->init_devices(); } return; } Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile 2001/02/06 00:15:42 1.5 +++ Makefile 2001/02/18 20:37:39 1.6 @@ -12,7 +12,7 @@ O_TARGET := kernel.o obj-y := process.o setup.o regdump.o interrupt.o entry.o time.o \ - syscall.o signal.o semaphore.o \ + syscall.o signal.o semaphore.o vax_dev_init.o\ init_task.o reboot.o cpu_generic.o \ cpu_ka630.o cpu_ka640.o cpu_ka650.o cpu_ka660.o \ cpu_ka410.o cpu_ka42.o cpu_ka43.o cpu_ka46.o cpu_ka55.o Index: cpu_ka46.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/cpu_ka46.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cpu_ka46.c 2001/02/15 16:50:54 1.3 +++ cpu_ka46.c 2001/02/18 20:37:39 1.4 @@ -24,6 +24,8 @@ void ka46_cache_clear(void); void ka46_cache_enable(void); +void ka46_init_devices(void); + const char *ka46_cpu_type_str(void); struct ka46_machine_vector { @@ -47,7 +49,7 @@ NULL, /* reboot */ NULL, /* halt */ - NULL, /* init_devices */ + ka46_init_devices, /* init_devices */ ka46_cpu_type_str }, @@ -118,3 +120,12 @@ *(int *)KA46_CCR = KA46_CCR_SPECIO | KA46_CCR_CENA; } + + +void ka46_init_devices(void) +{ + printk("ka46: init_devices\n"); +#ifdef CONFIG_VSABUS + vsa_setup(); +#endif /* CONFIG_VSABUS */ +} |