On 8/18/09, Mario Limonciello <mario_limonciello@xxxxxxxx> wrote:
> In order to be useful in modern kernels and standard interfaces,
> compal-laptop should have rfkill support. This patch adds it.
> --
> Mario Limonciello
> *Dell | Linux Engineering*
> mario_limonciello@xxxxxxxx
>
I have some comments of my own as well, so here goes.
> +static void compal_rfkill_query(struct rfkill *rfkill, void *data)
> +{
> + unsigned long radio = (unsigned long) data;
> + u8 result;
> + bool blocked;
> +
> + ec_read(COMPAL_EC_COMMAND_WIRELESS, &result);
> +
> + if ((result & KILLSWITCH_MASK) == 0)
> + blocked = 1;
> + else if (radio == WLAN_MASK)
> + blocked = !(result & WLAN_MASK);
> + else
> + blocked = !((result & BT_MASK) >> 1);
Ick, this is overdone. You should just be able to do
+ else
+ blocked = !(result & radio);
> + rfkill_set_sw_state(rfkill,blocked);
> + rfkill_set_hw_state(rfkill,0);
This last line is redundant. The HW state will default to "unblocked"
if you never set it.
> +static int compal_rfkill_set(void *data, bool blocked)
> +{
> + unsigned long radio = (unsigned long) data;
> + u8 result, value;
> +
> + ec_read(COMPAL_EC_COMMAND_WIRELESS, &result);
> +
> + if ((result & KILLSWITCH_MASK) == 0)
> + return -EINVAL;
> + else {
> + if (!blocked)
> + value = (u8) (result | radio);
> + else
> + value = (u8) (result & ~radio);
> + ec_write(COMPAL_EC_COMMAND_WIRELESS, value);
> + }
> +
> + return 0;
> +}
Note that the return value of rfkill_set is not propagated to
userspace through the /dev/rfkill interface.
The way you use "KILLSWITCH_MASK", it looks like a hard rfkill bit
that covers all radios. Why don't you report it as a hard block on
each rfkill device?
Note that strictly speaking, you should only call one rfkill_set
function within the query() method.
"@query: query the rfkill block state(s) and call exactly one of the
rfkill_set{,_hw,_sw}_state family of functions."
(I'd recommend reading the comments in include/linux/rfkill.h if you
haven't already). So If you do want to set both hw and sw states in
query(), you should use rfkill_set_states().
> +static int setup_rfkill(void)
> +{
> + int ret;
> +
> + wifi_rfkill = rfkill_alloc("compal-wifi", NULL, RFKILL_TYPE_WLAN,
> + &compal_rfkill_ops, (void *) WLAN_MASK);
I think you should use "compal_device->dev" in place of NULL here.
Otherwise the rfkill devices will appear in sysfs as "virtual
devices", belonging to no "physical" device.
> + bluetooth_rfkill = rfkill_alloc("compal-bluetooth", NULL, RFKILL_TYPE_BLUETOOTH,
> + &compal_rfkill_ops, (void *) BT_MASK);
Same here.
Regards
Alan
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
