From: <mr...@us...> - 2003-08-28 21:03:51
|
Update of /cvsroot/ltp/ltp/testcases/kernel/device-drivers/base/tbase In directory sc8-pr-cvs1:/tmp/cvs-serv23239 Modified Files: tbase.c tbase.h Log Message: Updates for 2.5.73 kernel level Index: tbase.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/device-drivers/base/tbase/tbase.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- tbase.c 14 Aug 2003 18:54:03 -0000 1.1 +++ tbase.c 28 Aug 2003 21:03:40 -0000 1.2 @@ -52,7 +52,7 @@ static int test_sysdev_cls_reg(void); static int test_sysdev_reg(void); -static int Major = 0; +static int Major = TBASEMAJOR; static ltpmod_user_t ltp_mod; /* @@ -817,6 +817,8 @@ device_register(&test_device); tbase_fops.owner = THIS_MODULE; + + printk("tbase: *** Register device %s **\n", DEVICE_NAME); rc = register_chrdev(Major, DEVICE_NAME, &tbase_fops); if (rc < 0) { Index: tbase.h =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/device-drivers/base/tbase/tbase.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- tbase.h 14 Aug 2003 18:54:03 -0000 1.1 +++ tbase.h 28 Aug 2003 21:03:40 -0000 1.2 @@ -1,13 +1,15 @@ // tbase.h #define TMOD_DRIVER_NAME "ltp test drivers/base" -#define DEVICE_NAME "tbase" +#define DEVICE_NAME "/dev/tbase" #define MAG_NUM 'k' /* put ioctl flags here, use the _IO macro which is found in linux/ioctl.h, takes a letter, and an integer */ +#define TBASEMAJOR 253 + #define DEV_PROBE _IO(MAG_NUM, 1) #define REG_DEVICE _IO(MAG_NUM, 2) #define UNREG_DEVICE _IO(MAG_NUM, 3) @@ -22,7 +24,7 @@ #define CREATE_FILE _IO(MAG_NUM, 12) #define DEV_SUSPEND _IO(MAG_NUM, 13) #define DEV_FILE _IO(MAG_NUM, 14) -#define BUS_RESCAN _IO(MAG_NUM, 15) +#define BUS_RESCAN _IO(TBASEMAJOR, 15) #define BUS_FILE _IO(MAG_NUM, 16) #define CLASS_REG _IO(MAG_NUM, 17) #define CLASS_UNREG _IO(MAG_NUM, 18) |