ibmasm driver: redesign handling of remote control events
Subsystems (2)
PATCH 3/4 ibmasm driver: redesign handling of remote control events
This patch rewrites the handling of remote control events. Rather than making them available from a special file in the ibmasmfs, now the events from the RSA card get translated into kernel input events and injected into the input subsystem. The driver now will generate two /dev/input/eventX nodes -- one for the keyboard and one for the mouse. The mouse node generates absolute events more like a touch pad than a mouse.
My apologies for this being sent as an attachment, but I can't get my mailer to accept the one umlaut in the patch.
drivers/misc/ibmasm/ibmasmfs.c +0 -89
@@ -37,9 +37,7 @@* | |-- event * | |-- reverse_heartbeat * | `-- remote_video -* | |-- connected * | |-- depth -* | |-- events * | |-- height * | `-- width * .
@@ -50,9 +48,7 @@* |-- event * |-- reverse_heartbeat * `-- remote_video -* |-- connected * |-- depth -* |-- events * |-- height * `-- width *
@@ -75,14 +71,6 @@* remote_video/width: control remote display settings * write: set value * read: read value -* -* remote_video/connected -* read: return "1" if web browser VNC java applet is connected, -* "0" otherwise -* -* remote_video/events -* read: sleep until a remote mouse or keyboard event occurs, then return -* then event. */ #include <linux/fs.h>
@@ -593,75 +581,6 @@return count; } -static int remote_event_file_open (struct inode *inode,struct file *file) -{ -struct service_processor *sp; -unsigned long flags; -struct remote_queue *q; - - file->private_data = inode->u.generic_ip; - sp = file->private_data; - q = &sp->remote_queue; - -/* allow only one event reader */ -spin_lock_irqsave (&sp->lock, flags); -if (q->open) { -spin_unlock_irqrestore (&sp->lock, flags); -return -EBUSY ; - } - q->open =1 ; -spin_unlock_irqrestore (&sp->lock, flags); - -enable_mouse_interrupts (sp); - -return 0 ; -} - -static int remote_event_file_close (struct inode *inode,struct file *file) -{ -struct service_processor *sp = file->private_data; - -disable_mouse_interrupts (sp); -wake_up_interruptible (&sp->remote_queue.wait); - sp->remote_queue.open =0 ; - -return 0 ; -} - -static ssize_t remote_event_file_read (struct file *file,char __user *buf,size_t count,loff_t *offset) -{ -struct service_processor *sp = file->private_data; -struct remote_queue *q = &sp->remote_queue; -size_t data_size; -struct remote_event *reader = q->reader; -size_t num_events; - -if (*offset <0 ) -return -EINVAL ; -if (count ==0 || count >1024 ) -return 0 ; -if (*offset !=0 ) -return 0 ; - -if (wait_event_interruptible (q->wait, q->reader != q->writer)) -return -ERESTARTSYS ; - -/* only get multiples of struct remote_event */ - num_events =min ((count/sizeof (struct remote_event )),ibmasm_events_available (q)); -if (!num_events) -return 0 ; - - data_size = num_events *sizeof (struct remote_event ); - -if (copy_to_user (buf, reader, data_size)) -return -EFAULT ; - -ibmasm_advance_reader (q, num_events); - -return data_size; -} - -static struct file_operations command_fops = { .open = command_file_open, .release = command_file_close,
@@ -690,12 +609,6 @@ .write = remote_settings_file_write, }; -static struct file_operations remote_event_fops = { - .open = remote_event_file_open, - .release = remote_event_file_close, - .read = remote_event_file_read, -}; -static void ibmasmfs_create_files (struct super_block *sb,struct dentry *root) {
@@ -721,7 +634,5 @@ibmasmfs_create_file (sb, remote_dir,"width" , &remote_settings_fops, (void *)display_width (sp),S_IRUSR |S_IWUSR );ibmasmfs_create_file (sb, remote_dir,"height" , &remote_settings_fops, (void *)display_height (sp),S_IRUSR |S_IWUSR );ibmasmfs_create_file (sb, remote_dir,"depth" , &remote_settings_fops, (void *)display_depth (sp),S_IRUSR |S_IWUSR ); -ibmasmfs_create_file (sb, remote_dir,"connected" , &remote_settings_fops, (void *)vnc_status (sp),S_IRUSR ); -ibmasmfs_create_file (sb, remote_dir,"events" , &remote_event_fops, (void *)sp,S_IRUSR ); } }
drivers/misc/ibmasm/ibmasm.h +21 -42
102 lines not on this page · raw message
drivers/misc/ibmasm/lowlevel.c +11 -7
@@ -46,8 +46,8 @@ message =get_i2o_message (sp->base_address, mfa); -memcpy (&message->header, &header,sizeof (struct i2o_header )); -memcpy (&message->data, command->buffer, command_size); +memcpy_toio (&message->header, &header,sizeof (struct i2o_header )); +memcpy_toio (&message->data, command->buffer, command_size);set_mfa_inbound (sp->base_address, mfa);
@@ -59,23 +59,27 @@u32 mfa;struct service_processor *sp = (struct service_processor *)dev_id;void __iomem *base_address = sp->base_address; +char tsbuf[32 ];if (!sp_interrupt_pending (base_address))return IRQ_NONE ; +dbg ("respond to interrupt at %s\n" ,get_timestamp (tsbuf)); +if (mouse_interrupt_pending (sp)) { -ibmasm_handle_mouse_interrupt (sp); - mfa =get_mfa_outbound (base_address); +ibmasm_handle_mouse_interrupt (sp, regs);clear_mouse_interrupt (sp); -set_mfa_outbound (base_address, mfa); -return IRQ_HANDLED ; } mfa =get_mfa_outbound (base_address);if (valid_mfa (mfa)) {struct i2o_message *msg =get_i2o_message (base_address, mfa);ibmasm_receive_message (sp, &msg->data,incoming_data_size (msg)); - } + }else +dbg ("didn't get a valid MFA\n" ); +set_mfa_outbound (base_address, mfa); +dbg ("finished interrupt at %s\n" ,get_timestamp (tsbuf)); +return IRQ_HANDLED ; }
drivers/misc/ibmasm/module.c +40 -29
131 lines not on this page · raw message
drivers/misc/ibmasm/remote.c +213 -93
352 lines not on this page · raw message
drivers/misc/ibmasm/remote.h +162 -11
198 lines not on this page · raw message