From: Adrian M. <zx8...@us...> - 2002-09-18 22:49:17
|
Update of /cvsroot/linuxdc/linux-sh-dc/drivers/mtd/devices In directory usw-pr-cvs1:/tmp/cvs-serv2545/drivers/mtd/devices Modified Files: Config.in vmublk.c Log Message: vmublk code tidied up Index: Config.in =================================================================== RCS file: /cvsroot/linuxdc/linux-sh-dc/drivers/mtd/devices/Config.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Config.in 18 Sep 2002 20:17:56 -0000 1.1 +++ Config.in 18 Sep 2002 22:49:14 -0000 1.2 @@ -51,8 +51,8 @@ fi fi -if ["$CONFIG_MTD_VMU" = "y"]; then - dep_tristate ' SEGA Dreamcast VMU block device driver' CONFIG_MTD_VMUBLK -fi +comment 'SEGA Dreamcast Visual Memory Unit' + dep_tristate ' SEGA Dreamcast VMU block device driver' CONFIG_MTD_VMUBLK $CONFIG_MTD_VMU + endmenu Index: vmublk.c =================================================================== RCS file: /cvsroot/linuxdc/linux-sh-dc/drivers/mtd/devices/vmublk.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- vmublk.c 18 Sep 2002 20:06:28 -0000 1.1 +++ vmublk.c 18 Sep 2002 22:49:14 -0000 1.2 @@ -1,7 +1,7 @@ /* * * - * VMU Flash File System Driver for LinuxDC + * VMU Flash Block Driver for LinuxDC * http://sourceforge.net/projects/linuxdc * * Copyright, Adrian McMenamin, 2002 @@ -20,8 +20,6 @@ * */ -#define VMUFS_DEBUG -#define CONFIG_DEVFS_FS @@ -35,7 +33,7 @@ #include <linux/fs.h> #include <linux/blkdev.h> -#define DEVICE_NAME "vmufs" +#define DEVICE_NAME "vmublk" #define DEVICE_NR(device) (device) #define MAJOR_NR MTD_BLOCK_MAJOR #define DEVICE_NO_RANDOM @@ -110,7 +108,7 @@ struct mtd_info *mtd; int dev; - DEBUG(MTD_DEBUG_LEVEL1, "vmuflash_fs_open\n"); + DEBUG(MTD_DEBUG_LEVEL1, "vmublk_open\n"); if (!inode) return -EINVAL; @@ -182,7 +180,7 @@ { int dev; struct vmublk_dev *vmublk; - DEBUG(MTD_DEBUG_LEVEL1, "mtdblock_release\n"); + DEBUG(MTD_DEBUG_LEVEL1, "vmublock_release\n"); if (inode == NULL) release_return(-ENODEV); @@ -295,7 +293,7 @@ static int count = 0; if (count++ < 45) /* TO DO: Lower this for production driver */ printk(KERN_WARNING - "vmufs: requested an unknown device: %i\n", + "vmublk: requested an unknown device: %i\n", devno); return -1; } @@ -321,7 +319,7 @@ static int count = 0; if (count++ < 45) /* TO DO: Lower this for production driver */ printk(KERN_WARNING - "vmufs: failed on read\n"); + "vmublk: failed on read\n"); break; } @@ -406,13 +404,13 @@ vmublk_size[i] = 0; vmublksize_size[i] = 0; /* Not fixed (in theory) for DC vmu flash */ } - /* init_waitqueue_head(&vmufs_wq); */ + blksize_size[MAJOR_NR] = vmublksize_size; blk_size[MAJOR_NR] = vmublk_size; blk_init_queue(BLK_DEFAULT_QUEUE(MAJOR_NR), &vmufs_request); -/*kernel_thread (vmufs_thread, NULL, CLONE_FS|CLONE_FILES|CLONE_SIGHAND); *//* Do I need this? */ + return 0; } @@ -420,9 +418,6 @@ static void __exit exit_vmufs(void) { - /* leaving = 1; - wake_up(&thr_wq); - down(&thread_sem); */ #ifdef CONFIG_DEVFS_FS unregister_mtd_user(¬ifier); devfs_unregister(devfs_dir_handle); |