IBMASM - miscellaneous fixes
Subsystems (2)
cover IBMASM - miscellaneous fixes
Hi,
Here is bunch of fixes for ibmasm driver. They are untested as I do not have the hardware.
--
Dmitry
PATCH 1/4 IBMASM: whitespace cleanup
IBMASM: whitespace cleanup
---
drivers/misc/ibmasm/command.c | 14 +++++++------- drivers/misc/ibmasm/dot_command.c | 10 +++++----- drivers/misc/ibmasm/dot_command.h | 2 +- drivers/misc/ibmasm/event.c | 8 ++++---- drivers/misc/ibmasm/heartbeat.c | 2 +- drivers/misc/ibmasm/i2o.h | 10 +++++----- drivers/misc/ibmasm/ibmasm.h | 6 +++--- drivers/misc/ibmasm/ibmasmfs.c | 24 ++++++++++++------------ drivers/misc/ibmasm/lowlevel.c | 2 +- drivers/misc/ibmasm/lowlevel.h | 16 ++++++++-------- drivers/misc/ibmasm/module.c | 10 +++++----- drivers/misc/ibmasm/r_heartbeat.c | 10 +++++----- drivers/misc/ibmasm/remote.h | 8 ++++---- drivers/misc/ibmasm/uart.c | 2 +- 14 files changed, 62 insertions(+), 62 deletions(-)
drivers/misc/ibmasm/command.c +7 -7
@@ -18,7 +18,7 @@* * Copyright (C) IBM Corporation, 2004 * -* Author: Max Asböck <[email protected]> +* Author: Max Asböck <[email protected]> * */
@@ -72,7 +72,7 @@ struct command *ibmasm_new_command(strucstatic void free_command (struct kobject *kobj) {struct command *cmd =to_command (kobj); - +list_del (&cmd->queue_node);atomic_dec (&command_count);dbg ("command count: %d\n" ,atomic_read (&command_count));
@@ -113,14 +113,14 @@ static inline void do_exec_command(strucexec_next_command (sp); } } - +/** * exec_command * send a command to a service processor * Commands are executed sequentially. One command (sp->current_command) * is sent to the service processor. Once the interrupt handler gets a * message of type command_response, the message is copied into -* the current commands buffer, +* the current commands buffer, */ void ibmasm_exec_command (struct service_processor *sp,struct command *cmd) {
@@ -160,7 +160,7 @@ static void exec_next_command(struct ser } } -/** +/** * Sleep until a command has failed or a response has been received * and the command status been updated by the interrupt handler. * (see receive_response).
@@ -182,8 +182,8 @@ void ibmasm_receive_command_response(str {struct command *cmd = sp->current_command; -if (!sp->current_command) -return ; +if (!sp->current_command) +return ;memcpy_fromio (cmd->buffer, response,min (size, cmd->buffer_size)); cmd->status =IBMASM_CMD_COMPLETE ;
drivers/misc/ibmasm/dot_command.c +5 -5
@@ -17,7 +17,7 @@* * Copyright (C) IBM Corporation, 2004 * -* Author: Max Asböck <[email protected]> +* Author: Max Asböck <[email protected]> * */
@@ -44,11 +44,11 @@ void ibmasm_receive_message(struct servi size = message_size;switch (header->type) { -case sp_event: +case sp_event:ibmasm_receive_event (sp, message, size);break ;case sp_command_response: -ibmasm_receive_command_response (sp, message, size); +ibmasm_receive_command_response (sp, message, size);break ;case sp_heartbeat:ibmasm_receive_heartbeat (sp, message, size);
@@ -95,7 +95,7 @@ int ibmasm_send_driver_vpd(struct servicstrcat (vpd_data,IBMASM_DRIVER_VPD ); vpd_data[10 ] =0 ; vpd_data[15 ] =0 ; - +ibmasm_exec_command (sp, command);ibmasm_wait_for_response (command,IBMASM_CMD_TIMEOUT_NORMAL );
@@ -118,7 +118,7 @@ struct os_state_command {* During driver init this function is called with os state "up". * This causes the service processor to start sending heartbeats the * driver. -* During driver exit the function is called with os state "down", +* During driver exit the function is called with os state "down", * causing the service processor to stop the heartbeats. */ int ibmasm_send_os_state (struct service_processor *sp,int os_state)
drivers/misc/ibmasm/dot_command.h +1 -1
@@ -17,7 +17,7 @@* * Copyright (C) IBM Corporation, 2004 * -* Author: Max Asböck <[email protected]> +* Author: Max Asböck <[email protected]> * */
drivers/misc/ibmasm/event.c +4 -4
@@ -18,7 +18,7 @@* * Copyright (C) IBM Corporation, 2004 * -* Author: Max Asböck <[email protected]> +* Author: Max Asböck <[email protected]> * */
@@ -51,7 +51,7 @@ static void wake_up_event_readers(struct* event readers. * There is no reader marker in the buffer, therefore readers are * responsible for keeping up with the writer, or they will loose events. -*/ +*/ void ibmasm_receive_event (struct service_processor *sp,void *data,unsigned int data_size) {struct event_buffer *buffer = sp->event_buffer;
@@ -77,13 +77,13 @@ void ibmasm_receive_event(struct servicestatic inline int event_available (struct event_buffer *b,struct event_reader *r) { -return (r->next_serial_number < b->next_serial_number); +return (r->next_serial_number < b->next_serial_number); }/** * get_next_event * Called by event readers (initiated from user space through the file -* system). +* system). * Sleeps until a new event is available. */ int ibmasm_get_next_event (struct service_processor *sp,struct event_reader *reader)
drivers/misc/ibmasm/heartbeat.c +1 -1
@@ -18,7 +18,7 @@* * Copyright (C) IBM Corporation, 2004 * -* Author: Max Asböck <[email protected]> +* Author: Max Asböck <[email protected]> * */
drivers/misc/ibmasm/i2o.h +5 -5
@@ -17,7 +17,7 @@* * Copyright (C) IBM Corporation, 2004 * -* Author: Max Asböck <[email protected]> +* Author: Max Asböck <[email protected]> * */
@@ -26,9 +26,9 @@ struct i2o_header {u8 version;u8 message_flags;u16 message_size; -u8 target; +u8 target;u8 initiator_and_target; -u8 initiator; +u8 initiator;u8 function;u32 initiator_context; };
@@ -64,12 +64,12 @@ static inline unsigned short outgoing_me size =sizeof (struct i2o_header ) + data_size; i2o_size = size /sizeof (u32); - +if (size %sizeof (u32)) i2o_size++;return i2o_size; -} +}static inline u32 incoming_data_size (struct i2o_message *i2o_message) {
drivers/misc/ibmasm/ibmasm.h +3 -3
@@ -18,7 +18,7 @@* * Copyright (C) IBM Corporation, 2004 * -* Author: Max Asböck <[email protected]> +* Author: Max Asböck <[email protected]> * */
@@ -58,8 +58,8 @@ static inline char *get_timestamp(char *return buf; } -#define IBMASM_CMD_PENDING 0 -#define IBMASM_CMD_COMPLETE 1 +#define IBMASM_CMD_PENDING 0 +#define IBMASM_CMD_COMPLETE 1#define IBMASM_CMD_FAILED 2#define IBMASM_CMD_TIMEOUT_NORMAL 45
drivers/misc/ibmasm/ibmasmfs.c +12 -12
@@ -17,12 +17,12 @@* * Copyright (C) IBM Corporation, 2004 * -* Author: Max Asböck <[email protected]> +* Author: Max Asböck <[email protected]> * */ /* -* Parts of this code are based on an article by Jonathan Corbet +* Parts of this code are based on an article by Jonathan Corbet * that appeared in Linux Weekly News. */
@@ -55,22 +55,22 @@* For each service processor the following files are created: * * command: execute dot commands -* write: execute a dot command on the service processor -* read: return the result of a previously executed dot command +* write: execute a dot command on the service processor +* read: return the result of a previously executed dot command * * events: listen for service processor events -* read: sleep (interruptible) until an event occurs +* read: sleep (interruptible) until an event occurs * write: wakeup sleeping event listener * * reverse_heartbeat: send a heartbeat to the service processor -* read: sleep (interruptible) until the reverse heartbeat fails +* read: sleep (interruptible) until the reverse heartbeat fails * write: wakeup sleeping heartbeat listener * * remote_video/width * remote_video/height * remote_video/width: control remote display settings -* write: set value -* read: read value +* write: set value +* read: read value */ #include <linux/fs.h>
@@ -155,7 +155,7 @@ static struct inode *ibmasmfs_make_inodestatic struct dentry *ibmasmfs_create_file (struct super_block *sb,struct dentry *parent, -const char *name, +const char *name,const struct file_operations *fops,void *data,int mode)
@@ -261,7 +261,7 @@ static int command_file_close(struct inostruct ibmasmfs_command_data *command_data = file->private_data;if (command_data->command) -command_put (command_data->command); +command_put (command_data->command);kfree (command_data);return 0 ;
@@ -348,7 +348,7 @@ static ssize_t command_file_write(structstatic int event_file_open (struct inode *inode,struct file *file) {struct ibmasmfs_event_data *event_data; -struct service_processor *sp; +struct service_processor *sp;if (!inode->i_private)return -ENODEV ;
@@ -573,7 +573,7 @@ static ssize_t remote_settings_file_writkfree (buff);return -EFAULT ; } - + value =simple_strtoul (buff,NULL ,10 );writel (value, address);kfree (buff);
drivers/misc/ibmasm/lowlevel.c +1 -1
@@ -17,7 +17,7 @@* * Copyright (C) IBM Corporation, 2004 * -* Author: Max Asböck <[email protected]> +* Author: Max Asböck <[email protected]> * */
drivers/misc/ibmasm/lowlevel.h +8 -8
@@ -17,7 +17,7 @@* * Copyright (C) IBM Corporation, 2004 * -* Author: Max Asböck <[email protected]> +* Author: Max Asböck <[email protected]> * */
@@ -48,9 +48,9 @@#define INTR_CONTROL_REGISTER 0x13A4#define SCOUT_COM_A_BASE 0x0000 -#define SCOUT_COM_B_BASE 0x0100 -#define SCOUT_COM_C_BASE 0x0200 -#define SCOUT_COM_D_BASE 0x0300 +#define SCOUT_COM_B_BASE 0x0100 +#define SCOUT_COM_C_BASE 0x0200 +#define SCOUT_COM_D_BASE 0x0300static inline int sp_interrupt_pending (void __iomem *base_address) {
@@ -86,12 +86,12 @@ static inline void disable_sp_interruptsstatic inline void enable_uart_interrupts (void __iomem *base_address) { -ibmasm_enable_interrupts (base_address,UART_INTR_MASK ); +ibmasm_enable_interrupts (base_address,UART_INTR_MASK ); }static inline void disable_uart_interrupts (void __iomem *base_address) { -ibmasm_disable_interrupts (base_address,UART_INTR_MASK ); +ibmasm_disable_interrupts (base_address,UART_INTR_MASK ); }#define valid_mfa (mfa) ( (mfa) != NO_MFAS_AVAILABLE )
@@ -111,7 +111,7 @@ static inline u32 get_mfa_outbound(voidstatic inline void set_mfa_outbound (void __iomem *base_address,u32 mfa) { -writel (mfa, base_address +OUTBOUND_QUEUE_PORT ); +writel (mfa, base_address +OUTBOUND_QUEUE_PORT ); }static inline u32 get_mfa_inbound (void __iomem *base_address)
@@ -126,7 +126,7 @@ static inline u32 get_mfa_inbound(void _static inline void set_mfa_inbound (void __iomem *base_address,u32 mfa) { -writel (mfa, base_address +INBOUND_QUEUE_PORT ); +writel (mfa, base_address +INBOUND_QUEUE_PORT ); }static inline struct i2o_message *get_i2o_message (void __iomem *base_address,u32 mfa)
drivers/misc/ibmasm/module.c +5 -5
@@ -18,9 +18,9 @@* * Copyright (C) IBM Corporation, 2004 * -* Author: Max Asböck <[email protected]> +* Author: Max Asböck <[email protected]> * -* This driver is based on code originally written by Pete Reynolds +* This driver is based on code originally written by Pete Reynolds * and others. * */
@@ -30,13 +30,13 @@* * 1) When loaded it sends a message to the service processor, * indicating that an OS is * running. This causes the service processor -* to send periodic heartbeats to the OS. +* to send periodic heartbeats to the OS. * * 2) Answers the periodic heartbeats sent by the service processor. * Failure to do so would result in system reboot. * * 3) Acts as a pass through for dot commands sent from user applications. -* The interface for this is the ibmasmfs file system. +* The interface for this is the ibmasmfs file system. * * 4) Allows user applications to register for event notification. Events * are sent to the driver through interrupts. They can be read from user
@@ -105,7 +105,7 @@ static int __devinit ibmasm_init_one(str } sp->irq = pdev->irq; - sp->base_address =ioremap (pci_resource_start (pdev,0 ), + sp->base_address =ioremap (pci_resource_start (pdev,0 ),pci_resource_len (pdev,0 ));if (sp->base_address ==0 ) {dev_err (sp->dev,"Failed to ioremap pci memory\n" );
drivers/misc/ibmasm/r_heartbeat.c +5 -5
@@ -16,7 +16,7 @@* * Copyright (C) IBM Corporation, 2004 * -* Author: Max Asböck <[email protected]> +* Author: Max Asböck <[email protected]> * */
@@ -36,10 +36,10 @@ static struct {unsigned char command[3 ]; } rhb_dot_cmd = { .header = { - .type = sp_read, + .type = sp_read, .command_size = 3, .data_size = 0, - .status =0 + .status =0 }, .command = { 4, 3, 6 } };
@@ -76,9 +76,9 @@ int ibmasm_start_reverse_heartbeat(strucif (cmd->status !=IBMASM_CMD_COMPLETE ) times_failed++; -wait_event_interruptible_timeout (rhb->wait, +wait_event_interruptible_timeout (rhb->wait, rhb->stopped, -REVERSE_HEARTBEAT_TIMEOUT *HZ ); +REVERSE_HEARTBEAT_TIMEOUT *HZ );if (signal_pending (current) || rhb->stopped) { result = -EINTR ;
drivers/misc/ibmasm/remote.h +4 -4
@@ -18,7 +18,7 @@* * Copyright (C) IBM Corporation, 2004 * -* Author: Max Asböck <[email protected]> +* Author: Max Asböck <[email protected]> * * Orignally written by Pete Reynolds */
@@ -73,7 +73,7 @@ struct keyboard_input { -struct remote_input { +struct remote_input {union {struct mouse_input mouse;struct keyboard_input keyboard;
@@ -85,7 +85,7 @@ struct remote_input {unsigned char pad3; }; -#define mouse_addr (sp) (sp->base_address + CONDOR_MOUSE_DATA) +#define mouse_addr (sp) (sp->base_address + CONDOR_MOUSE_DATA)#define display_width (sp) (mouse_addr(sp) + CONDOR_INPUT_DISPLAY_RESX)#define display_height (sp) (mouse_addr(sp) + CONDOR_INPUT_DISPLAY_RESY)#define display_depth (sp) (mouse_addr(sp) + CONDOR_INPUT_DISPLAY_BITS)
@@ -93,7 +93,7 @@ struct remote_input {#define vnc_status (sp) (mouse_addr(sp) + CONDOR_OUTPUT_VNC_STATUS)#define isr_control (sp) (mouse_addr(sp) + CONDOR_MOUSE_ISR_CONTROL) -#define mouse_interrupt_pending (sp) readl(mouse_addr(sp) + CONDOR_MOUSE_ISR_STATUS) +#define mouse_interrupt_pending (sp) readl(mouse_addr(sp) + CONDOR_MOUSE_ISR_STATUS)#define clear_mouse_interrupt (sp) writel(0, mouse_addr(sp) + CONDOR_MOUSE_ISR_STATUS)#define enable_mouse_interrupts (sp) writel(1, mouse_addr(sp) + CONDOR_MOUSE_ISR_CONTROL)#define disable_mouse_interrupts (sp) writel(0, mouse_addr(sp) + CONDOR_MOUSE_ISR_CONTROL)
drivers/misc/ibmasm/uart.c +1 -1
@@ -18,7 +18,7 @@* * Copyright (C) IBM Corporation, 2004 * -* Author: Max Asböck <[email protected]> +* Author: Max Asböck <[email protected]> * */
PATCH 2/4 IBMASM: dont use extern in function declarations
In reply to Dmitry TorokhovIBMASM: don't use extern in function declarations
We normally don't use extern in function declarations located in header files.
---
drivers/misc/ibmasm/ibmasm.h | 64 +++++++++++++++++++++---------------------- 1 files changed, 32 insertions(+), 32 deletions(-)
drivers/misc/ibmasm/ibmasm.h +32 -32
@@ -163,55 +163,55 @@ struct service_processor { };/* command processing */ -extern struct command *ibmasm_new_command (struct service_processor *sp,size_t buffer_size); -extern void ibmasm_exec_command (struct service_processor *sp,struct command *cmd); -extern void ibmasm_wait_for_response (struct command *cmd,int timeout); -extern void ibmasm_receive_command_response (struct service_processor *sp,void *response,size_t size); +struct command *ibmasm_new_command (struct service_processor *sp,size_t buffer_size); +void ibmasm_exec_command (struct service_processor *sp,struct command *cmd); +void ibmasm_wait_for_response (struct command *cmd,int timeout); +void ibmasm_receive_command_response (struct service_processor *sp,void *response,size_t size);/* event processing */ -extern int ibmasm_event_buffer_init (struct service_processor *sp); -extern void ibmasm_event_buffer_exit (struct service_processor *sp); -extern void ibmasm_receive_event (struct service_processor *sp,void *data,unsigned int data_size); -extern void ibmasm_event_reader_register (struct service_processor *sp,struct event_reader *reader); -extern void ibmasm_event_reader_unregister (struct service_processor *sp,struct event_reader *reader); -extern int ibmasm_get_next_event (struct service_processor *sp,struct event_reader *reader); -extern void ibmasm_cancel_next_event (struct event_reader *reader); +int ibmasm_event_buffer_init (struct service_processor *sp); +void ibmasm_event_buffer_exit (struct service_processor *sp); +void ibmasm_receive_event (struct service_processor *sp,void *data,unsigned int data_size); +void ibmasm_event_reader_register (struct service_processor *sp,struct event_reader *reader); +void ibmasm_event_reader_unregister (struct service_processor *sp,struct event_reader *reader); +int ibmasm_get_next_event (struct service_processor *sp,struct event_reader *reader); +void ibmasm_cancel_next_event (struct event_reader *reader);/* heartbeat - from SP to OS */ -extern void ibmasm_register_panic_notifier (void ); -extern void ibmasm_unregister_panic_notifier (void ); -extern int ibmasm_heartbeat_init (struct service_processor *sp); -extern void ibmasm_heartbeat_exit (struct service_processor *sp); -extern void ibmasm_receive_heartbeat (struct service_processor *sp,void *message,size_t size); +void ibmasm_register_panic_notifier (void ); +void ibmasm_unregister_panic_notifier (void ); +int ibmasm_heartbeat_init (struct service_processor *sp); +void ibmasm_heartbeat_exit (struct service_processor *sp); +void ibmasm_receive_heartbeat (struct service_processor *sp,void *message,size_t size);/* reverse heartbeat - from OS to SP */ -extern void ibmasm_init_reverse_heartbeat (struct service_processor *sp,struct reverse_heartbeat *rhb); -extern int ibmasm_start_reverse_heartbeat (struct service_processor *sp,struct reverse_heartbeat *rhb); -extern void ibmasm_stop_reverse_heartbeat (struct reverse_heartbeat *rhb); +void ibmasm_init_reverse_heartbeat (struct service_processor *sp,struct reverse_heartbeat *rhb); +int ibmasm_start_reverse_heartbeat (struct service_processor *sp,struct reverse_heartbeat *rhb); +void ibmasm_stop_reverse_heartbeat (struct reverse_heartbeat *rhb);/* dot commands */ -extern void ibmasm_receive_message (struct service_processor *sp,void *data,int data_size); -extern int ibmasm_send_driver_vpd (struct service_processor *sp); -extern int ibmasm_send_os_state (struct service_processor *sp,int os_state); +void ibmasm_receive_message (struct service_processor *sp,void *data,int data_size); +int ibmasm_send_driver_vpd (struct service_processor *sp); +int ibmasm_send_os_state (struct service_processor *sp,int os_state);/* low level message processing */ -extern int ibmasm_send_i2o_message (struct service_processor *sp); -extern irqreturn_t ibmasm_interrupt_handler (int irq,void * dev_id); +int ibmasm_send_i2o_message (struct service_processor *sp); +irqreturn_t ibmasm_interrupt_handler (int irq,void * dev_id);/* remote console */ -extern void ibmasm_handle_mouse_interrupt (struct service_processor *sp); -extern int ibmasm_init_remote_input_dev (struct service_processor *sp); -extern void ibmasm_free_remote_input_dev (struct service_processor *sp); +void ibmasm_handle_mouse_interrupt (struct service_processor *sp); +int ibmasm_init_remote_input_dev (struct service_processor *sp); +void ibmasm_free_remote_input_dev (struct service_processor *sp);/* file system */ -extern int ibmasmfs_register (void ); -extern void ibmasmfs_unregister (void ); -extern void ibmasmfs_add_sp (struct service_processor *sp); +int ibmasmfs_register (void ); +void ibmasmfs_unregister (void ); +void ibmasmfs_add_sp (struct service_processor *sp);/* uart */ #ifdef CONFIG_SERIAL_8250 -extern void ibmasm_register_uart (struct service_processor *sp); -extern void ibmasm_unregister_uart (struct service_processor *sp); +void ibmasm_register_uart (struct service_processor *sp); +void ibmasm_unregister_uart (struct service_processor *sp);#else #define ibmasm_register_uart (sp) do { } while(0)#define ibmasm_unregister_uart (sp) do { } while(0)
PATCH 3/4 IBMASM: miscellaneous fixes
In reply to Dmitry TorokhovIBMASM: miscellaneous fixes
Fix some minor issues, such as:
- properly set up ID of keyboard device (was mixed up with mouse)
- constify translation tables
- change some variables to #defines
- set up input device's parent to form proper sysfs hierarchy
- minor formatting changes
---
drivers/misc/ibmasm/remote.c | 37 ++++++++++++++++++------------------- 1 files changed, 18 insertions(+), 19 deletions(-)
drivers/misc/ibmasm/remote.c +18 -19
@@ -28,11 +28,10 @@#include "ibmasm.h" #include "remote.h" -static int xmax =1600 ; -static int ymax =1200 ; +#define MOUSE_X_MAX 1600 +#define MOUSE_Y_MAX 1200 - -static unsigned short xlate_high[XLATE_SIZE ] = { +static const unsigned short xlate_high[XLATE_SIZE ] = { [KEY_SYM_ENTER &0xff ] =KEY_ENTER , [KEY_SYM_KPSLASH &0xff ] =KEY_KPSLASH , [KEY_SYM_KPSTAR &0xff ] =KEY_KPASTERISK ,
@@ -81,7 +80,8 @@ static unsigned short xlate_high[XLATE_S [KEY_SYM_NUM_LOCK & 0xff] = KEY_NUMLOCK, [KEY_SYM_SCR_LOCK & 0xff] = KEY_SCROLLLOCK, }; -static unsigned short xlate[XLATE_SIZE ] = { + +static const unsigned short xlate[XLATE_SIZE ] = { [NO_KEYCODE ] =KEY_RESERVED , [KEY_SYM_SPACE ] =KEY_SPACE , [KEY_SYM_TILDE ] =KEY_GRAVE , [KEY_SYM_BKTIC ] =KEY_GRAVE ,
@@ -133,19 +133,16 @@ static unsigned short xlate[XLATE_SIZE] [KEY_SYM_Z] = KEY_Z, [KEY_SYM_z] = KEY_Z, }; -static char remote_mouse_name[] ="ibmasm RSA I remote mouse" ; -static char remote_keybd_name[] ="ibmasm RSA I remote keyboard" ; -static void print_input (struct remote_input *input) {if (input->type ==INPUT_TYPE_MOUSE ) {unsigned char buttons = input->mouse_buttons;dbg ("remote mouse movement: (x,y)=(%d,%d)%s%s%s%s\n" , input->data.mouse.x, input->data.mouse.y, - (buttons)?" -- buttons:" :"" , - (buttons &REMOTE_BUTTON_LEFT )?"left " :"" , - (buttons &REMOTE_BUTTON_MIDDLE )?"middle " :"" , - (buttons &REMOTE_BUTTON_RIGHT )?"right" :"" + (buttons) ?" -- buttons:" :"" , + (buttons &REMOTE_BUTTON_LEFT ) ?"left " :"" , + (buttons &REMOTE_BUTTON_MIDDLE ) ?"middle " :"" , + (buttons &REMOTE_BUTTON_RIGHT ) ?"right" :"" ); }else { dbg("remote keypress (code, flag, down):"
@@ -180,7 +177,7 @@ static void send_keyboard_event(struct i key = xlate_high[code &0xff ]; else key = xlate[code]; -input_report_key (dev, key, (input->data.keyboard.key_down) ?1 :0 ); +input_report_key (dev, key, input->data.keyboard.key_down);input_sync (dev); }
@@ -228,20 +225,22 @@ int ibmasm_init_remote_input_dev(struct mouse_dev->id.vendor = pdev->vendor; mouse_dev->id.product = pdev->device; mouse_dev->id.version =1 ; + mouse_dev->dev.parent = sp->dev; mouse_dev->evbit[0 ] =BIT (EV_KEY ) |BIT (EV_ABS ); mouse_dev->keybit[LONG (BTN_MOUSE )] =BIT (BTN_LEFT ) |BIT (BTN_RIGHT ) |BIT (BTN_MIDDLE );set_bit (BTN_TOUCH , mouse_dev->keybit); - mouse_dev->name = remote_mouse_name; -input_set_abs_params (mouse_dev,ABS_X ,0 , xmax,0 ,0 ); -input_set_abs_params (mouse_dev,ABS_Y ,0 , ymax,0 ,0 ); + mouse_dev->name ="ibmasm RSA I remote mouse" ; +input_set_abs_params (mouse_dev,ABS_X ,0 ,MOUSE_X_MAX ,0 ,0 ); +input_set_abs_params (mouse_dev,ABS_Y ,0 ,MOUSE_Y_MAX ,0 ,0 ); - mouse_dev->id.bustype =BUS_PCI ; + keybd_dev->id.bustype =BUS_PCI ; keybd_dev->id.vendor = pdev->vendor; keybd_dev->id.product = pdev->device; - mouse_dev->id.version =2 ; + keybd_dev->id.version =2 ; + keybd_dev->dev.parent = sp->dev; keybd_dev->evbit[0 ] =BIT (EV_KEY ); - keybd_dev->name = remote_keybd_name; + keybd_dev->name ="ibmasm RSA I remote keyboard" ;for (i =0 ; i <XLATE_SIZE ; i++) {if (xlate_high[i])
PATCH 4/4 IBMASM: must depend on CONFIG_INPUT
In reply to Dmitry TorokhovIBMASM: must depend on CONFIG_INPUT
The driver registers couple of input devices and therefore must depend on CONFIG_INPUT.
---
drivers/misc/Kconfig | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-)
drivers/misc/Kconfig +1 -1
@@ -6,7 +6,7 @@ menu "Misc devices" config IBM_ASM tristate "Device driver for IBM RSA service processor" - depends on X86 && PCI && EXPERIMENTAL + depends on X86 && PCI && INPUT && EXPERIMENTAL ---help--- This option enables device driver support for in-band access to the IBM RSA (Condor) service processor in eServer xSeries systems.
Quoted 7 lines · Dmitry Torokhov
Hi,
Here is bunch of fixes for ibmasm driver. They are untested as I do not have the hardware.
--
Dmitry
Thanks for the fixes. I will test.
Max
Quoted 6 lines · Max Asbock
Quoted 5 lines · Dmitry Torokhov
Hi,
Here is bunch of fixes for ibmasm driver. They are untested as I do not have the hardware.
Quoted 7 lines
Quoted 2 lines
--
DmitryThanks for the fixes. I will test.
Max
What userland tools are needed to use the IBM ASM? I have several x330s.
Kevin