Skip to content

L
linux
Commit 5d7eaa6e authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds
Browse files
Options

[PATCH] pg.c Lindent 

pg.c fed through Lindent
parent a86128f1
Hide whitespace changes
Inline Side-by-side
Showing with 256 additions and 225 deletions
drivers/block/paride/pg.c
View file @ 5d7eaa6e
...@@ -136,17 +136,18 @@ ...@@ -136,17 +136,18 @@
*/ */
static int verbose = 0; static int verbose = 0;
static int major = PG_MAJOR; static int major = PG_MAJOR;
static char *name = PG_NAME; static char *name = PG_NAME;
static int disable = 0; static int disable = 0;
static int drive0[6] = {0,0,0,-1,-1,-1}; static int drive0[6] = { 0, 0, 0, -1, -1, -1 };
static int drive1[6] = {0,0,0,-1,-1,-1}; static int drive1[6] = { 0, 0, 0, -1, -1, -1 };
static int drive2[6] = {0,0,0,-1,-1,-1}; static int drive2[6] = { 0, 0, 0, -1, -1, -1 };
static int drive3[6] = {0,0,0,-1,-1,-1}; static int drive3[6] = { 0, 0, 0, -1, -1, -1 };
static int (*drives[4])[6] = {&drive0,&drive1,&drive2,&drive3}; static int (*drives[4])[6] = {
&drive0, &drive1, &drive2, &drive3};
static int pg_drive_count; static int pg_drive_count;
#define D_PRT 0 #define D_PRT 0
...@@ -160,7 +161,6 @@ static int pg_drive_count; ...@@ -160,7 +161,6 @@ static int pg_drive_count;
/* end of parameters */ /* end of parameters */
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/fs.h> #include <linux/fs.h>
...@@ -176,30 +176,32 @@ static int pg_drive_count; ...@@ -176,30 +176,32 @@ static int pg_drive_count;
#include "setup.h" #include "setup.h"
static STT pg_stt[5] = {{"drive0",6,drive0}, static STT pg_stt[5] = {
{"drive1",6,drive1}, {"drive0", 6, drive0},
{"drive2",6,drive2}, {"drive1", 6, drive1},
{"drive3",6,drive3}, {"drive2", 6, drive2},
{"disable",1,&disable}}; {"drive3", 6, drive3},
{"disable", 1, &disable}
void pg_setup( char *str, int *ints) };
{ generic_setup(pg_stt,5,str); void pg_setup(char *str, int *ints)
{
generic_setup(pg_stt, 5, str);
} }
#endif #endif
MODULE_PARM(verbose,"i"); MODULE_PARM(verbose, "i");
MODULE_PARM(major,"i"); MODULE_PARM(major, "i");
MODULE_PARM(name,"s"); MODULE_PARM(name, "s");
MODULE_PARM(drive0,"1-6i"); MODULE_PARM(drive0, "1-6i");
MODULE_PARM(drive1,"1-6i"); MODULE_PARM(drive1, "1-6i");
MODULE_PARM(drive2,"1-6i"); MODULE_PARM(drive2, "1-6i");
MODULE_PARM(drive3,"1-6i"); MODULE_PARM(drive3, "1-6i");
#include "paride.h" #include "paride.h"
#define PG_SPIN_DEL 50 /* spin delay in micro-seconds */ #define PG_SPIN_DEL 50 /* spin delay in micro-seconds */
#define PG_SPIN 200 #define PG_SPIN 200
#define PG_TMO HZ #define PG_TMO HZ
#define PG_RESET_TMO 10*HZ #define PG_RESET_TMO 10*HZ
...@@ -216,30 +218,30 @@ MODULE_PARM(drive3,"1-6i"); ...@@ -216,30 +218,30 @@ MODULE_PARM(drive3,"1-6i");
#define ATAPI_IDENTIFY 0x12 #define ATAPI_IDENTIFY 0x12
static int pg_open(struct inode *inode, struct file *file); static int pg_open(struct inode *inode, struct file *file);
static int pg_release (struct inode *inode, struct file *file); static int pg_release(struct inode *inode, struct file *file);
static ssize_t pg_read(struct file * filp, char * buf, static ssize_t pg_read(struct file *filp, char *buf,
size_t count, loff_t *ppos); size_t count, loff_t * ppos);
static ssize_t pg_write(struct file * filp, const char * buf, static ssize_t pg_write(struct file *filp, const char *buf,
size_t count, loff_t *ppos); size_t count, loff_t * ppos);
static int pg_detect(void); static int pg_detect(void);
static int pg_identify (int unit, int log); static int pg_identify(int unit, int log);
#define PG_NAMELEN 8 #define PG_NAMELEN 8
struct pg_unit { struct pg_unit {
struct pi_adapter pia; /* interface to paride layer */ struct pi_adapter pia; /* interface to paride layer */
struct pi_adapter *pi; struct pi_adapter *pi;
int busy; /* write done, read expected */ int busy; /* write done, read expected */
int start; /* jiffies at command start */ int start; /* jiffies at command start */
int dlen; /* transfer size requested */ int dlen; /* transfer size requested */
unsigned long timeout; /* timeout requested */ unsigned long timeout; /* timeout requested */
int status; /* last sense key */ int status; /* last sense key */
int drive; /* drive */ int drive; /* drive */
unsigned long access; /* count of active opens ... */ unsigned long access; /* count of active opens ... */
int present; /* device present ? */ int present; /* device present ? */
char *bufptr; char *bufptr;
char name[PG_NAMELEN]; /* pg0, pg1, ... */ char name[PG_NAMELEN]; /* pg0, pg1, ... */
}; };
struct pg_unit pg[PG_UNITS]; struct pg_unit pg[PG_UNITS];
...@@ -249,37 +251,39 @@ struct pg_unit pg[PG_UNITS]; ...@@ -249,37 +251,39 @@ struct pg_unit pg[PG_UNITS];
#define PG pg[unit] #define PG pg[unit]
#define PI PG.pi #define PI PG.pi
static char pg_scratch[512]; /* scratch block buffer */ static char pg_scratch[512]; /* scratch block buffer */
/* kernel glue structures */ /* kernel glue structures */
static struct file_operations pg_fops = { static struct file_operations pg_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.read = pg_read, .read = pg_read,
.write = pg_write, .write = pg_write,
.open = pg_open, .open = pg_open,
.release = pg_release, .release = pg_release,
}; };
void pg_init_units( void ) void pg_init_units(void)
{
{ int unit, j; int unit, j;
pg_drive_count = 0; pg_drive_count = 0;
for (unit=0;unit<PG_UNITS;unit++) { for (unit = 0; unit < PG_UNITS; unit++) {
PG.pi = & PG.pia; PG.pi = &PG.pia;
set_bit( 0, &PG.access ); set_bit(0, &PG.access);
PG.busy = 0; PG.busy = 0;
PG.present = 0; PG.present = 0;
PG.bufptr = NULL; PG.bufptr = NULL;
PG.drive = DU[D_SLV]; PG.drive = DU[D_SLV];
j = 0; j = 0;
while ((j < PG_NAMELEN-2) && (PG.name[j]=name[j])) j++; while ((j < PG_NAMELEN - 2) && (PG.name[j] = name[j]))
j++;
PG.name[j++] = '0' + unit; PG.name[j++] = '0' + unit;
PG.name[j] = 0; PG.name[j] = 0;
if (DU[D_PRT]) pg_drive_count++; if (DU[D_PRT])
pg_drive_count++;
} }
} }
static inline int status_reg(int unit) static inline int status_reg(int unit)
{ {
...@@ -298,9 +302,9 @@ static inline void write_reg(int unit, int reg, int val) ...@@ -298,9 +302,9 @@ static inline void write_reg(int unit, int reg, int val)
#define DRIVE (0xa0+0x10*PG.drive) #define DRIVE (0xa0+0x10*PG.drive)
static void pg_sleep( int cs ) static void pg_sleep(int cs)
{
{ current->state = TASK_INTERRUPTIBLE; current->state = TASK_INTERRUPTIBLE;
schedule_timeout(cs); schedule_timeout(cs);
} }
...@@ -311,8 +315,8 @@ static int pg_wait(int unit, int go, int stop, unsigned long tmo, char *msg) ...@@ -311,8 +315,8 @@ static int pg_wait(int unit, int go, int stop, unsigned long tmo, char *msg)
PG.status = 0; PG.status = 0;
j = 0; j = 0;
while ((((r=status_reg(unit))&go) || (stop&&(!(r&stop)))) while ((((r = status_reg(unit)) & go) || (stop && (!(r & stop))))
&& time_before(jiffies,tmo)) { && time_before(jiffies, tmo)) {
if (j++ < PG_SPIN) if (j++ < PG_SPIN)
udelay(PG_SPIN_DEL); udelay(PG_SPIN_DEL);
else else
...@@ -321,7 +325,7 @@ static int pg_wait(int unit, int go, int stop, unsigned long tmo, char *msg) ...@@ -321,7 +325,7 @@ static int pg_wait(int unit, int go, int stop, unsigned long tmo, char *msg)
to = time_after_eq(jiffies, tmo); to = time_after_eq(jiffies, tmo);
if ((r&(STAT_ERR&stop)) || to) { if ((r & (STAT_ERR & stop)) || to) {
s = read_reg(unit, 7); s = read_reg(unit, 7);
e = read_reg(unit, 1); e = read_reg(unit, 1);
p = read_reg(unit, 2); p = read_reg(unit, 2);
...@@ -342,16 +346,16 @@ static int pg_command(int unit, char *cmd, int dlen, unsigned long tmo) ...@@ -342,16 +346,16 @@ static int pg_command(int unit, char *cmd, int dlen, unsigned long tmo)
pi_connect(PI); pi_connect(PI);
write_reg(unit, 6,DRIVE); write_reg(unit, 6, DRIVE);
if (pg_wait(unit, STAT_BUSY|STAT_DRQ, 0, tmo, "before command")) { if (pg_wait(unit, STAT_BUSY | STAT_DRQ, 0, tmo, "before command")) {
pi_disconnect(PI); pi_disconnect(PI);
return -1; return -1;
} }
write_reg(unit, 4,dlen % 256); write_reg(unit, 4, dlen % 256);
write_reg(unit, 5,dlen / 256); write_reg(unit, 5, dlen / 256);
write_reg(unit, 7,0xa0); /* ATAPI packet command */ write_reg(unit, 7, 0xa0); /* ATAPI packet command */
if (pg_wait(unit, STAT_BUSY, STAT_DRQ, tmo, "command DRQ")) { if (pg_wait(unit, STAT_BUSY, STAT_DRQ, tmo, "command DRQ")) {
pi_disconnect(PI); pi_disconnect(PI);
...@@ -359,16 +363,17 @@ static int pg_command(int unit, char *cmd, int dlen, unsigned long tmo) ...@@ -359,16 +363,17 @@ static int pg_command(int unit, char *cmd, int dlen, unsigned long tmo)
} }
if (read_reg(unit, 2) != 1) { if (read_reg(unit, 2) != 1) {
printk("%s: command phase error\n",PG.name); printk("%s: command phase error\n", PG.name);
pi_disconnect(PI); pi_disconnect(PI);
return -1; return -1;
} }
pi_write_block(PI,cmd,12); pi_write_block(PI, cmd, 12);
if (verbose > 1) { if (verbose > 1) {
printk("%s: Command sent, dlen=%d packet= ", PG.name,dlen); printk("%s: Command sent, dlen=%d packet= ", PG.name, dlen);
for (k=0;k<12;k++) printk("%02x ",cmd[k]&0xff); for (k = 0; k < 12; k++)
printk("%02x ", cmd[k] & 0xff);
printk("\n"); printk("\n");
} }
return 0; return 0;
...@@ -378,154 +383,169 @@ static int pg_completion(int unit, char *buf, unsigned long tmo) ...@@ -378,154 +383,169 @@ static int pg_completion(int unit, char *buf, unsigned long tmo)
{ {
int r, d, n, p; int r, d, n, p;
r = pg_wait(unit, STAT_BUSY, STAT_DRQ|STAT_READY|STAT_ERR, r = pg_wait(unit, STAT_BUSY, STAT_DRQ | STAT_READY | STAT_ERR,
tmo, "completion"); tmo, "completion");
PG.dlen = 0; PG.dlen = 0;
while (read_reg(unit, 7)&STAT_DRQ) { while (read_reg(unit, 7) & STAT_DRQ) {
d = (read_reg(unit, 4)+256*read_reg(unit, 5)); d = (read_reg(unit, 4) + 256 * read_reg(unit, 5));
n = ((d+3)&0xfffc); n = ((d + 3) & 0xfffc);
p = read_reg(unit, 2)&3; p = read_reg(unit, 2) & 3;
if (p == 0) if (p == 0)
pi_write_block(PI,buf,n); pi_write_block(PI, buf, n);
if (p == 2) if (p == 2)
pi_read_block(PI,buf,n); pi_read_block(PI, buf, n);
if (verbose > 1) if (verbose > 1)
printk("%s: %s %d bytes\n", PG.name, printk("%s: %s %d bytes\n", PG.name,
p?"Read":"Write", n); p ? "Read" : "Write", n);
PG.dlen += (1-p)*d; PG.dlen += (1 - p) * d;
buf += d; buf += d;
r = pg_wait(unit, STAT_BUSY, STAT_DRQ|STAT_READY|STAT_ERR, r = pg_wait(unit, STAT_BUSY, STAT_DRQ | STAT_READY | STAT_ERR,
tmo, "completion"); tmo, "completion");
} }
pi_disconnect(PI); pi_disconnect(PI);
return r; return r;
} }
static int pg_reset( int unit ) static int pg_reset(int unit)
{
{ int i, k, flg; int i, k, flg;
int expect[5] = {1,1,1,0x14,0xeb}; int expect[5] = { 1, 1, 1, 0x14, 0xeb };
pi_connect(PI); pi_connect(PI);
write_reg(unit, 6,DRIVE); write_reg(unit, 6, DRIVE);
write_reg(unit, 7,8); write_reg(unit, 7, 8);
pg_sleep(20*HZ/1000); pg_sleep(20 * HZ / 1000);
k = 0; k = 0;
while ((k++ < PG_RESET_TMO) && (status_reg(unit)&STAT_BUSY)) while ((k++ < PG_RESET_TMO) && (status_reg(unit) & STAT_BUSY))
pg_sleep(1); pg_sleep(1);
flg = 1; flg = 1;
for(i=0;i<5;i++) flg &= (read_reg(unit, i+1) == expect[i]); for (i = 0; i < 5; i++)
flg &= (read_reg(unit, i + 1) == expect[i]);
if (verbose) { if (verbose) {
printk("%s: Reset (%d) signature = ",PG.name,k); printk("%s: Reset (%d) signature = ", PG.name, k);
for (i=0;i<5;i++) printk("%3x",read_reg(unit, i+1)); for (i = 0; i < 5; i++)
if (!flg) printk(" (incorrect)"); printk("%3x", read_reg(unit, i + 1));
if (!flg)
printk(" (incorrect)");
printk("\n"); printk("\n");
} }
pi_disconnect(PI); pi_disconnect(PI);
return flg-1; return flg - 1;
} }
static void xs( char *buf, char *targ, int offs, int len ) static void xs(char *buf, char *targ, int offs, int len)
{
{ int j,k,l; int j, k, l;
j=0; l=0; j = 0;
for (k=0;k<len;k++) l = 0;
if((buf[k+offs]!=0x20)||(buf[k+offs]!=l)) for (k = 0; k < len; k++)
l=targ[j++]=buf[k+offs]; if ((buf[k + offs] != 0x20) || (buf[k + offs] != l))
if (l==0x20) j--; l = targ[j++] = buf[k + offs];
targ[j]=0; if (l == 0x20)
j--;
targ[j] = 0;
} }
static int pg_identify( int unit, int log ) static int pg_identify(int unit, int log)
{
{ int s; int s;
char *ms[2] = {"master","slave"}; char *ms[2] = { "master", "slave" };
char mf[10], id[18]; char mf[10], id[18];
char id_cmd[12] = { ATAPI_IDENTIFY,0,0,0,36,0,0,0,0,0,0,0}; char id_cmd[12] = { ATAPI_IDENTIFY, 0, 0, 0, 36, 0, 0, 0, 0, 0, 0, 0 };
char buf[36]; char buf[36];
s = pg_command(unit,id_cmd,36,jiffies+PG_TMO); s = pg_command(unit, id_cmd, 36, jiffies + PG_TMO);
if (s) return -1; if (s)
s = pg_completion(unit,buf,jiffies+PG_TMO); return -1;
if (s) return -1; s = pg_completion(unit, buf, jiffies + PG_TMO);
if (s)
return -1;
if (log) { if (log) {
xs(buf,mf,8,8); xs(buf, mf, 8, 8);
xs(buf,id,16,16); xs(buf, id, 16, 16);
printk("%s: %s %s, %s\n",PG.name,mf,id,ms[PG.drive]); printk("%s: %s %s, %s\n", PG.name, mf, id, ms[PG.drive]);
} }
return 0; return 0;
} }
static int pg_probe( int unit ) /*
* returns 0, with id set if drive is detected
/* returns 0, with id set if drive is detected * -1, if drive detection failed
-1, if drive detection failed */
*/ static int pg_probe(int unit)
{
{ if (PG.drive == -1) { if (PG.drive == -1) {
for (PG.drive=0;PG.drive<=1;PG.drive++) for (PG.drive = 0; PG.drive <= 1; PG.drive++)
if (!pg_reset(unit)) return pg_identify(unit,1); if (!pg_reset(unit))
return pg_identify(unit, 1);
} else { } else {
if (!pg_reset(unit)) return pg_identify(unit,1); if (!pg_reset(unit))
return pg_identify(unit, 1);
} }
return -1; return -1;
} }
static int pg_detect( void ) static int pg_detect(void)
{
{ int k, unit; int k, unit;
printk("%s: %s version %s, major %d\n", printk("%s: %s version %s, major %d\n", name, name, PG_VERSION, major);
name,name,PG_VERSION,major);
k = 0; k = 0;
if (pg_drive_count == 0) { if (pg_drive_count == 0) {
unit = 0; unit = 0;
if (pi_init(PI,1,-1,-1,-1,-1,-1,pg_scratch, if (pi_init(PI, 1, -1, -1, -1, -1, -1, pg_scratch,
PI_PG,verbose,PG.name)) { PI_PG, verbose, PG.name)) {
if (!pg_probe(unit)) { if (!pg_probe(unit)) {
PG.present = 1; PG.present = 1;
k++; k++;
} else pi_release(PI); } else
} pi_release(PI);
}
} else for (unit=0;unit<PG_UNITS;unit++) if (DU[D_PRT])
if (pi_init(PI,0,DU[D_PRT],DU[D_MOD],DU[D_UNI], } else
DU[D_PRO],DU[D_DLY],pg_scratch,PI_PG,verbose, for (unit = 0; unit < PG_UNITS; unit++)
PG.name)) { if (DU[D_PRT])
if (!pg_probe(unit)) { if (pi_init
PG.present = 1; (PI, 0, DU[D_PRT], DU[D_MOD], DU[D_UNI],
k++; DU[D_PRO], DU[D_DLY], pg_scratch, PI_PG,
} else pi_release(PI); verbose, PG.name)) {
} if (!pg_probe(unit)) {
PG.present = 1;
if (k) return 0; k++;
} else
printk("%s: No ATAPI device detected\n",name); pi_release(PI);
}
if (k)
return 0;
printk("%s: No ATAPI device detected\n", name);
return -1; return -1;
} }
#define DEVICE_NR(dev) (minor(dev) & 0x7F) #define DEVICE_NR(dev) (minor(dev) & 0x7F)
static int pg_open (struct inode *inode, struct file *file) static int pg_open(struct inode *inode, struct file *file)
{
{ int unit = DEVICE_NR(inode->i_rdev); int unit = DEVICE_NR(inode->i_rdev);
if ((unit >= PG_UNITS) || (!PG.present)) return -ENODEV; if ((unit >= PG_UNITS) || (!PG.present))
return -ENODEV;
if ( test_and_set_bit(0, &PG.access) ) { if (test_and_set_bit(0, &PG.access)) {
return -EBUSY; return -EBUSY;
} }
...@@ -534,66 +554,72 @@ static int pg_open (struct inode *inode, struct file *file) ...@@ -534,66 +554,72 @@ static int pg_open (struct inode *inode, struct file *file)
PG.busy = 0; PG.busy = 0;
} }
pg_identify(unit,(verbose>1)); pg_identify(unit, (verbose > 1));
PG.bufptr = kmalloc(PG_MAX_DATA,GFP_KERNEL); PG.bufptr = kmalloc(PG_MAX_DATA, GFP_KERNEL);
if (PG.bufptr == NULL) { if (PG.bufptr == NULL) {
clear_bit( 0, &PG.access ) ; clear_bit(0, &PG.access);
printk("%s: buffer allocation failed\n",PG.name); printk("%s: buffer allocation failed\n", PG.name);
return -ENOMEM; return -ENOMEM;
} }
return 0; return 0;
} }
static int pg_release (struct inode *inode, struct file *file) static int pg_release(struct inode *inode, struct file *file)
{ {
int unit = DEVICE_NR(inode->i_rdev); int unit = DEVICE_NR(inode->i_rdev);
if ( unit >= PG_UNITS || !test_bit(0,&PG.access) ) if (unit >= PG_UNITS || !test_bit(0, &PG.access))
return -EINVAL; return -EINVAL;
clear_bit( 0, &PG.access); clear_bit(0, &PG.access);
kfree(PG.bufptr); kfree(PG.bufptr);
PG.bufptr = NULL; PG.bufptr = NULL;
return 0; return 0;
} }
static ssize_t pg_write(struct file * filp, const char * buf, static ssize_t pg_write(struct file *filp, const char *buf, size_t count, loff_t *ppos)
size_t count, loff_t *ppos) {
struct inode *ino = filp->f_dentry->d_inode;
int unit = DEVICE_NR(ino->i_rdev);
struct pg_write_hdr hdr;
int hs = sizeof (hdr);
{ struct inode *ino = filp->f_dentry->d_inode; if (PG.busy)
int unit = DEVICE_NR(ino->i_rdev); return -EBUSY;
struct pg_write_hdr hdr; if (count < hs)
int hs = sizeof(hdr); return -EINVAL;
if (PG.busy) return -EBUSY; if (copy_from_user((char *) &hdr, buf, hs))
if (count < hs) return -EINVAL;
if (copy_from_user((char *)&hdr, buf, hs))
return -EFAULT; return -EFAULT;
if (hdr.magic != PG_MAGIC) return -EINVAL; if (hdr.magic != PG_MAGIC)
if (hdr.dlen > PG_MAX_DATA) return -EINVAL; return -EINVAL;
if ((count - hs) > PG_MAX_DATA) return -EINVAL; if (hdr.dlen > PG_MAX_DATA)
return -EINVAL;
if ((count - hs) > PG_MAX_DATA)
return -EINVAL;
if (hdr.func == PG_RESET) { if (hdr.func == PG_RESET) {
if (count != hs) return -EINVAL; if (count != hs)
if (pg_reset(unit)) return -EIO; return -EINVAL;
if (pg_reset(unit))
return -EIO;
return count; return count;
} }
if (hdr.func != PG_COMMAND) return -EINVAL; if (hdr.func != PG_COMMAND)
return -EINVAL;
PG.start = jiffies; PG.start = jiffies;
PG.timeout = hdr.timeout*HZ + HZ/2 + jiffies; PG.timeout = hdr.timeout * HZ + HZ / 2 + jiffies;
if (pg_command(unit,hdr.packet,hdr.dlen,jiffies+PG_TMO)) { if (pg_command(unit, hdr.packet, hdr.dlen, jiffies + PG_TMO)) {
if (PG.status & 0x10) return -ETIME; if (PG.status & 0x10)
return -ETIME;
return -EIO; return -EIO;
} }
...@@ -604,22 +630,24 @@ static ssize_t pg_write(struct file * filp, const char * buf, ...@@ -604,22 +630,24 @@ static ssize_t pg_write(struct file * filp, const char * buf,
return count; return count;
} }
static ssize_t pg_read(struct file * filp, char * buf, static ssize_t pg_read(struct file *filp, char *buf, size_t count, loff_t *ppos)
size_t count, loff_t *ppos) {
struct inode *ino = filp->f_dentry->d_inode;
{ struct inode *ino = filp->f_dentry->d_inode; int unit = DEVICE_NR(ino->i_rdev);
int unit = DEVICE_NR(ino->i_rdev); struct pg_read_hdr hdr;
struct pg_read_hdr hdr; int hs = sizeof (hdr);
int hs = sizeof(hdr); int copy;
int copy;
if (!PG.busy) return -EINVAL; if (!PG.busy)
if (count < hs) return -EINVAL; return -EINVAL;
if (count < hs)
return -EINVAL;
PG.busy = 0; PG.busy = 0;
if (pg_completion(unit,PG.bufptr,PG.timeout)) if (pg_completion(unit, PG.bufptr, PG.timeout))
if (PG.status & 0x10) return -ETIME; if (PG.status & 0x10)
return -ETIME;
hdr.magic = PG_MAGIC; hdr.magic = PG_MAGIC;
hdr.dlen = PG.dlen; hdr.dlen = PG.dlen;
...@@ -628,18 +656,19 @@ static ssize_t pg_read(struct file * filp, char * buf, ...@@ -628,18 +656,19 @@ static ssize_t pg_read(struct file * filp, char * buf,
if (hdr.dlen < 0) { if (hdr.dlen < 0) {
hdr.dlen = -1 * hdr.dlen; hdr.dlen = -1 * hdr.dlen;
copy = hdr.dlen; copy = hdr.dlen;
if (copy > (count - hs)) copy = count - hs; if (copy > (count - hs))
copy = count - hs;
} }
hdr.duration = (jiffies - PG.start + HZ/2) / HZ; hdr.duration = (jiffies - PG.start + HZ / 2) / HZ;
hdr.scsi = PG.status & 0x0f; hdr.scsi = PG.status & 0x0f;
if (copy_to_user(buf, (char *)&hdr, hs)) if (copy_to_user(buf, (char *) &hdr, hs))
return -EFAULT; return -EFAULT;
if (copy > 0) if (copy > 0)
if (copy_to_user(buf+hs,PG.bufptr,copy)) if (copy_to_user(buf + hs, PG.bufptr, copy))
return -EFAULT; return -EFAULT;
return copy+hs; return copy + hs;
} }
static int __init pg_init(void) static int __init pg_init(void)
...@@ -654,18 +683,19 @@ static int __init pg_init(void) ...@@ -654,18 +683,19 @@ static int __init pg_init(void)
if (pg_detect()) if (pg_detect())
return -1; return -1;
if (register_chrdev(major,name,&pg_fops)) { if (register_chrdev(major, name, &pg_fops)) {
printk("pg_init: unable to get major number %d\n", printk("pg_init: unable to get major number %d\n", major);
major); for (unit = 0; unit < PG_UNITS; unit++)
for (unit=0;unit<PG_UNITS;unit++) if (PG.present)
if (PG.present) pi_release(PI); pi_release(PI);
return -1; return -1;
} }
devfs_mk_dir ("pg"); devfs_mk_dir("pg");
for (unit=0; unit<PG_UNITS; unit++) for (unit = 0; unit < PG_UNITS; unit++)
if (PG.present) { if (PG.present) {
devfs_mk_cdev(MKDEV(major, unit), devfs_mk_cdev(MKDEV(major, unit),
S_IFCHR | S_IRUSR | S_IWUSR, "pg/%u", unit); S_IFCHR | S_IRUSR | S_IWUSR, "pg/%u",
unit);
} }
return 0; return 0;
} }
...@@ -674,15 +704,16 @@ static void __exit pg_exit(void) ...@@ -674,15 +704,16 @@ static void __exit pg_exit(void)
{ {
int unit; int unit;
for (unit=0; unit<PG_UNITS; unit++) for (unit = 0; unit < PG_UNITS; unit++)
if (PG.present) if (PG.present)
devfs_remove("pg/%u", unit); devfs_remove("pg/%u", unit);
devfs_remove ("pg"); devfs_remove("pg");
unregister_chrdev(major,name); unregister_chrdev(major, name);
for (unit=0;unit<PG_UNITS;unit++) for (unit = 0; unit < PG_UNITS; unit++)
if (PG.present) pi_release(PI); if (PG.present)
pi_release(PI);
} }
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7