Skip to content

Commit

Permalink
cinoptions=(0,w0,g0,Ls,:0
Browse files Browse the repository at this point in the history
  • Loading branch information
Costa Shulyupin authored and Costa Shulyupin committed Feb 16, 2021
1 parent e2e7aba commit be02363
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 53 deletions.
16 changes: 8 additions & 8 deletions dio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ static int ro, wo; /* read only, write only*/

/*
#define VERBOSE
*/
*/

int output(int dev, void *buf, int size)
{
Expand All @@ -75,7 +75,7 @@ int output(int dev, void *buf, int size)
break;
case ioctl_io:
ioctl(dev, _IOC(_IOC_WRITE, ioctl_type, ioctl_num,
size & _IOC_SIZEMASK), buf);
size & _IOC_SIZEMASK), buf);
break;
case file_io:
default:
Expand All @@ -101,7 +101,7 @@ int input(int dev, void *buf, int size)
break;
case ioctl_io:
ioctl(dev, _IOC(_IOC_READ, ioctl_type, ioctl_num,
size & _IOC_SIZEMASK), buf);
size & _IOC_SIZEMASK), buf);
ret = size;
break;
case file_io:
Expand Down Expand Up @@ -145,7 +145,7 @@ int io_start(int dev)
trvd_(data_in_len);
trln();
#endif
again:
again:
chkne(ret = output(dev, inbuf, data_in_len));
if (ret < 0 && errno == EAGAIN) {
usleep(100000);
Expand Down Expand Up @@ -252,9 +252,9 @@ int expand_arg(char *arg)
{
if (!arg)
return 0;
/*
return_if_arg_is_equal(SOCK_STREAM);
*/
/*
return_if_arg_is_equal(SOCK_STREAM);
*/
return strtol(arg, NULL, 0);
}

Expand Down Expand Up @@ -320,7 +320,7 @@ int main(int argc, char *argv[])
chkne(dev = open(dev_name, O_CREAT | O_RDWR, 0666));
if (io_type == mmap_io) {
mm = mmap(NULL, buf_size, PROT_READ | PROT_WRITE,
MAP_SHARED, dev, offset & ~(sysconf(_SC_PAGESIZE)-1));
MAP_SHARED, dev, offset & ~(sysconf(_SC_PAGESIZE)-1));
if (mm == MAP_FAILED) {
warn("mmap() failed");
goto exit;
Expand Down
52 changes: 26 additions & 26 deletions ldt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ static struct ldt_data *drvdata;
static void ldt_received(char data)
{
kfifo_in_spinlocked(&drvdata->in_fifo, &data,
sizeof(data), &drvdata->fifo_lock);
sizeof(data), &drvdata->fifo_lock);
wake_up_interruptible(&drvdata->readable);
}

Expand Down Expand Up @@ -153,8 +153,8 @@ static void ldt_tasklet_func(unsigned long d)

if (drvdata->uart_detected) {
while (tx_ready() && kfifo_out_spinlocked(&drvdata->out_fifo,
&data_out, sizeof(data_out),
&drvdata->fifo_lock)) {
&data_out, sizeof(data_out),
&drvdata->fifo_lock)) {
wake_up_interruptible(&drvdata->writeable);
pr_debug("data_out=%d %c\n", data_out, data_out >= 32 ? data_out : ' ');
ldt_send(data_out);
Expand All @@ -167,8 +167,8 @@ static void ldt_tasklet_func(unsigned long d)
}
} else {
while (kfifo_out_spinlocked(&drvdata->out_fifo,
&data_out, sizeof(data_out),
&drvdata->fifo_lock)) {
&data_out, sizeof(data_out),
&drvdata->fifo_lock)) {
wake_up_interruptible(&drvdata->writeable);
pr_debug("data_out=%d\n", data_out);
ldt_send(data_out);
Expand Down Expand Up @@ -256,7 +256,7 @@ static int ldt_release(struct inode *inode, struct file *file)
}

static ssize_t ldt_read(struct file *file, char __user *buf,
size_t count, loff_t *ppos)
size_t count, loff_t *ppos)
{
int ret = 0;
unsigned int copied;
Expand All @@ -268,7 +268,7 @@ static ssize_t ldt_read(struct file *file, char __user *buf,
} else {
pr_debug("waiting\n");
ret = wait_event_interruptible(drvdata->readable,
!kfifo_is_empty(&drvdata->in_fifo));
!kfifo_is_empty(&drvdata->in_fifo));
if (ret == -ERESTARTSYS) {
pr_err("%s\n", "interrupted");
return -EINTR;
Expand All @@ -283,7 +283,7 @@ static ssize_t ldt_read(struct file *file, char __user *buf,
}

static ssize_t ldt_write(struct file *file, const char __user *buf,
size_t count, loff_t *ppos)
size_t count, loff_t *ppos)
{
int ret;
unsigned int copied;
Expand All @@ -294,7 +294,7 @@ static ssize_t ldt_write(struct file *file, const char __user *buf,
return -EAGAIN;
} else {
ret = wait_event_interruptible(drvdata->writeable,
!kfifo_is_full(&drvdata->out_fifo));
!kfifo_is_full(&drvdata->out_fifo));
if (ret == -ERESTARTSYS) {
pr_err("%s\n", "interrupted");
return -EINTR;
Expand All @@ -318,12 +318,12 @@ static unsigned int ldt_poll(struct file *file, poll_table *pt)
if (!kfifo_is_empty(&drvdata->in_fifo))
mask |= POLLIN | POLLRDNORM;
mask |= POLLOUT | POLLWRNORM;
/*
if case of output end of file set
mask |= POLLHUP;
in case of output error set
mask |= POLLERR;
*/
/*
if case of output end of file set
mask |= POLLHUP;
in case of output error set
mask |= POLLERR;
*/
return mask;
}

Expand Down Expand Up @@ -362,9 +362,9 @@ static int ldt_mmap(struct file *filp, struct vm_area_struct *vma)
}

#define trace_ioctl(nr) pr_debug("ioctl=(%c%c %c #%i %i)\n", \
(_IOC_READ & _IOC_DIR(nr)) ? 'r' : ' ', \
(_IOC_WRITE & _IOC_DIR(nr)) ? 'w' : ' ', \
_IOC_TYPE(nr), _IOC_NR(nr), _IOC_SIZE(nr))
(_IOC_READ & _IOC_DIR(nr)) ? 'r' : ' ', \
(_IOC_WRITE & _IOC_DIR(nr)) ? 'w' : ' ', \
_IOC_TYPE(nr), _IOC_NR(nr), _IOC_SIZE(nr))

static DEFINE_MUTEX(ioctl_lock);

Expand All @@ -385,7 +385,7 @@ static long ldt_ioctl(struct file *f, unsigned int cmnd, unsigned long arg)
case 0:
if (_IOC_DIR(cmnd) == _IOC_WRITE) {
if (copy_from_user(drvdata->in_buf, user,
_IOC_SIZE(cmnd))) {
_IOC_SIZE(cmnd))) {
ret = -EFAULT;
goto exit;
}
Expand All @@ -395,7 +395,7 @@ static long ldt_ioctl(struct file *f, unsigned int cmnd, unsigned long arg)
}
if (_IOC_DIR(cmnd) == _IOC_READ) {
if (copy_to_user(user, drvdata->out_buf,
_IOC_SIZE(cmnd))) {
_IOC_SIZE(cmnd))) {
ret = -EFAULT;
goto exit;
}
Expand Down Expand Up @@ -464,27 +464,27 @@ static int uart_probe(void)
* full UART driver drivers/tty/serial/8250/8250.c
*/
ret = request_irq(irq, ldt_isr,
IRQF_SHARED, KBUILD_MODNAME, THIS_MODULE);
IRQF_SHARED, KBUILD_MODNAME, THIS_MODULE);
if (ret < 0) {
pr_err("%s\n", "request_irq failed");
return ret;
}
iowrite8(UART_MCR_RTS | UART_MCR_OUT2 | UART_MCR_LOOP,
drvdata->port_ptr + UART_MCR);
drvdata->port_ptr + UART_MCR);
drvdata->uart_detected = (ioread8(drvdata->port_ptr + UART_MSR) & 0xF0)
== (UART_MSR_DCD | UART_MSR_CTS);

if (drvdata->uart_detected) {
iowrite8(UART_IER_RDI | UART_IER_RLSI | UART_IER_THRI,
drvdata->port_ptr + UART_IER);
drvdata->port_ptr + UART_IER);
iowrite8(UART_MCR_DTR | UART_MCR_RTS | UART_MCR_OUT2,
drvdata->port_ptr + UART_MCR);
drvdata->port_ptr + UART_MCR);
iowrite8(UART_FCR_ENABLE_FIFO | UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT,
drvdata->port_ptr + UART_FCR);
drvdata->port_ptr + UART_FCR);
pr_debug("loopback=%d\n", loopback);
if (loopback)
iowrite8(ioread8(drvdata->port_ptr + UART_MCR) | UART_MCR_LOOP,
drvdata->port_ptr + UART_MCR);
drvdata->port_ptr + UART_MCR);
}
if (!drvdata->uart_detected && loopback)
pr_warn("Emulating loopback in software\n");
Expand Down
32 changes: 16 additions & 16 deletions misc_loop_drv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
/*
* It's supposed you computer doesn't use floppy device.
* This drivers uses IRQ and port of floppy device for demonstration.
*/
*/

static int port = 0x3f4;
module_param(port, int, 0);
Expand Down Expand Up @@ -108,8 +108,8 @@ static void misc_loop_drv_tasklet_func(unsigned long d)
struct misc_loop_drv_data *drvdata = (void *)d;

while (!ioread8(drvdata->port_ptr + MISC_DRV_TX_FULL)
&& kfifo_out_spinlocked(&drvdata->out_fifo,
&data_out, sizeof(data_out), &drvdata->fifo_lock)) {
&& kfifo_out_spinlocked(&drvdata->out_fifo,
&data_out, sizeof(data_out), &drvdata->fifo_lock)) {
wake_up_interruptible(&drvdata->writeable);
pr_debug("data_out=%d %c\n", data_out, data_out >= 32 ? data_out : ' ');
iowrite8(data_out, drvdata->port_ptr + MISC_DRV_TX);
Expand All @@ -127,7 +127,7 @@ static void misc_loop_drv_tasklet_func(unsigned long d)
data_in = ioread8(drvdata->port_ptr + MISC_DRV_RX);
pr_debug("data_in=%d %c\n", data_in, data_in >= 32 ? data_in : ' ');
kfifo_in_spinlocked(&drvdata->in_fifo, &data_in,
sizeof(data_in), &drvdata->fifo_lock);
sizeof(data_in), &drvdata->fifo_lock);
wake_up_interruptible(&drvdata->readable);
/* clear rx ready flag and implicitly tx full flag */
iowrite8(0, drvdata->port_ptr + MISC_DRV_RX_READY);
Expand Down Expand Up @@ -159,7 +159,7 @@ static int misc_loop_drv_release(struct inode *inode, struct file *file)
}

static ssize_t misc_loop_drv_read(struct file *file, char __user *buf,
size_t count, loff_t *ppos)
size_t count, loff_t *ppos)
{
int ret = 0;
unsigned int copied;
Expand All @@ -171,7 +171,7 @@ static ssize_t misc_loop_drv_read(struct file *file, char __user *buf,
} else {
pr_debug("%s\n", "waiting");
ret = wait_event_interruptible(drvdata->readable,
!kfifo_is_empty(&drvdata->in_fifo));
!kfifo_is_empty(&drvdata->in_fifo));
if (ret == -ERESTARTSYS) {
pr_err("interrupted\n");
return -EINTR;
Expand All @@ -187,7 +187,7 @@ static ssize_t misc_loop_drv_read(struct file *file, char __user *buf,
}

static ssize_t misc_loop_drv_write(struct file *file, const char __user *buf,
size_t count, loff_t *ppos)
size_t count, loff_t *ppos)
{
int ret;
unsigned int copied;
Expand All @@ -198,7 +198,7 @@ static ssize_t misc_loop_drv_write(struct file *file, const char __user *buf,
return -EAGAIN;
} else {
ret = wait_event_interruptible(drvdata->writeable,
!kfifo_is_full(&drvdata->out_fifo));
!kfifo_is_full(&drvdata->out_fifo));
if (ret == -ERESTARTSYS) {
pr_err("interrupted\n");
return -EINTR;
Expand All @@ -223,12 +223,12 @@ static unsigned int misc_loop_drv_poll(struct file *file, poll_table *pt)
if (!kfifo_is_empty(&drvdata->in_fifo))
mask |= POLLIN | POLLRDNORM;
mask |= POLLOUT | POLLWRNORM;
/*
if case of output end of file set
mask |= POLLHUP;
in case of output error set
mask |= POLLERR;
*/
/*
if case of output end of file set
mask |= POLLHUP;
in case of output error set
mask |= POLLERR;
*/
return mask;
}

Expand Down Expand Up @@ -280,7 +280,7 @@ static struct misc_loop_drv_data *misc_loop_drv_data_init(void)
mutex_init(&drvdata->read_lock);
mutex_init(&drvdata->write_lock);
tasklet_init(&drvdata->misc_loop_drv_tasklet,
misc_loop_drv_tasklet_func, (unsigned long)drvdata);
misc_loop_drv_tasklet_func, (unsigned long)drvdata);
return drvdata;
}

Expand All @@ -306,7 +306,7 @@ static int misc_loop_drv_init(void)
Real I/O port should be mapped with function with ioport_map:
drvdata->port_ptr = ioport_map(port, port_size);
But, because we work in emulation mode, we use array instead mapped ports
*/
*/
drvdata->port_ptr = (void __iomem *) port_emulation;
if (!drvdata->port_ptr) {
pr_err("ioport_map failed\n");
Expand Down
6 changes: 3 additions & 3 deletions pci-ldt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ static irqreturn_t pci_ldt_irq(int irq, struct instance_data *d)
static irqreturn_t pci_ldt_th(int irq, struct instance_data *d)
{
/* TODO: process interrupt
return IRQ_HANDLED;
*/
return IRQ_HANDLED;
*/
++irqs;
return IRQ_NONE;
}
Expand Down Expand Up @@ -134,7 +134,7 @@ static int pci_ldt_probe(struct pci_dev *pcid, const struct pci_device_id *ent)
data->base = pcim_iomap_table(pcid)[bar];
trvp(data->base);
print_hex_dump(KERN_DEBUG, "regs:", DUMP_PREFIX_OFFSET,
16, 2, data->base, 64, 0);
16, 2, data->base, 64, 0);
}

return 0;
Expand Down

0 comments on commit be02363

Please sign in to comment.