Changeset 998 for trunk

Show
Ignore:
Timestamp:
08/23/07 07:09:41 (17 months ago)
Author:
aj
Message:

update hal configuration and addon script.

Location:
trunk/etc
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/etc/openct.fdi

    r996 r998  
    22<deviceinfo version="0.2"> 
    33  <device> 
    4     <match key="info.bus" string="usb_device"> 
     4    <match key="info.bus" string="usb"> 
    55 
    6       <match key="usb_device.vendor_id" int="0973"> 
    7         <match key="usb_device.product_id" int="0001"> 
    8           <merge key="info.category" type="string">smart_card</merge> 
     6      <match key="usb.vendor_id" int="0x0973"> 
     7        <match key="usb.product_id" int="0x0001"> 
     8          <merge key="info.category" type="string">smart_card_reader</merge> 
    99          <append key="info.addons" type="strlist">hald-addon-openct</append> 
    1010        </match> 
    1111      </match> 
    1212 
    13       <match key="usb_device.vendor_id" int="0529"> 
    14         <match key="usb_device.product_id" int="050c"> 
    15           <merge key="info.category" type="string">smart_card</merge> 
     13      <match key="usb.vendor_id" int="0x0529"> 
     14        <match key="usb.product_id" int="0x050c"> 
     15          <merge key="info.category" type="string">smart_card_reader</merge> 
    1616          <append key="info.addons" type="strlist">hald-addon-openct</append> 
    1717        </match> 
    1818      </match> 
    1919 
    20       <match key="usb_device.vendor_id" int="0529"> 
    21         <match key="usb_device.product_id" int="0514"> 
    22           <merge key="info.category" type="string">smart_card</merge> 
     20      <match key="usb.vendor_id" int="0x0529"> 
     21        <match key="usb.product_id" int="0x0514"> 
     22          <merge key="info.category" type="string">smart_card_reader</merge> 
    2323          <append key="info.addons" type="strlist">hald-addon-openct</append> 
    2424        </match> 
    2525      </match> 
    2626 
    27       <match key="usb_device.vendor_id" int="0529"> 
    28         <match key="usb_device.product_id" int="0600"> 
    29           <merge key="info.category" type="string">smart_card</merge> 
     27      <match key="usb.vendor_id" int="0x0529"> 
     28        <match key="usb.product_id" int="0x0600"> 
     29          <merge key="info.category" type="string">smart_card_reader</merge> 
    3030          <append key="info.addons" type="strlist">hald-addon-openct</append> 
    3131        </match> 
    3232      </match> 
    3333 
    34       <match key="usb_device.vendor_id" int="0529"> 
    35         <match key="usb_device.product_id" int="0700"> 
    36           <merge key="info.category" type="string">smart_card</merge> 
     34      <match key="usb.vendor_id" int="0x0529"> 
     35        <match key="usb.product_id" int="0x0700"> 
     36          <merge key="info.category" type="string">smart_card_reader</merge> 
    3737          <append key="info.addons" type="strlist">hald-addon-openct</append> 
    3838        </match> 
    3939      </match> 
    4040 
    41       <match key="usb_device.vendor_id" int="073d"> 
    42         <match key="usb_device.product_id" int="0005"> 
    43           <merge key="info.category" type="string">smart_card</merge> 
     41      <match key="usb.vendor_id" int="0x073d"> 
     42        <match key="usb.product_id" int="0x0005"> 
     43          <merge key="info.category" type="string">smart_card_reader</merge> 
    4444          <append key="info.addons" type="strlist">hald-addon-openct</append> 
    4545        </match> 
    4646      </match> 
    4747 
    48       <match key="usb_device.vendor_id" int="04b9"> 
    49         <match key="usb_device.product_id" int="1200"> 
    50           <merge key="info.category" type="string">smart_card</merge> 
     48      <match key="usb.vendor_id" int="0x04b9"> 
     49        <match key="usb.product_id" int="0x1200"> 
     50          <merge key="info.category" type="string">smart_card_reader</merge> 
    5151          <append key="info.addons" type="strlist">hald-addon-openct</append> 
    5252        </match> 
    5353      </match> 
    5454 
    55       <match key="usb_device.vendor_id" int="04b9"> 
    56         <match key="usb_device.product_id" int="1300"> 
    57           <merge key="info.category" type="string">smart_card</merge> 
     55      <match key="usb.vendor_id" int="0x04b9"> 
     56        <match key="usb.product_id" int="0x1300"> 
     57          <merge key="info.category" type="string">smart_card_reader</merge> 
    5858          <append key="info.addons" type="strlist">hald-addon-openct</append> 
    5959        </match> 
    6060      </match> 
    6161 
    62       <match key="usb_device.vendor_id" int="096e"> 
    63         <match key="usb_device.product_id" int="0005"> 
    64           <merge key="info.category" type="string">smart_card</merge> 
     62      <match key="usb.vendor_id" int="0x096e"> 
     63        <match key="usb.product_id" int="0x0005"> 
     64          <merge key="info.category" type="string">smart_card_reader</merge> 
    6565          <append key="info.addons" type="strlist">hald-addon-openct</append> 
    6666        </match> 
    6767      </match> 
    6868 
    69       <match key="usb_device.device_class" int="0b"> 
    70         <match key="usb_device.device_subclass" int="00"> 
    71           <merge key="info.category" type="string">smart_card</merge> 
     69      <match key="usb.interface.class" int="0xb"> 
     70        <match key="usb.interface.subclass" int="0x0"> 
     71          <merge key="info.category" type="string">smart_card_reader</merge> 
    7272          <append key="info.addons" type="strlist">hald-addon-openct</append> 
    7373        </match> 
    7474      </match> 
    7575 
    76       <match key="usb_device.vendor_id" int="04e6"> 
    77         <match key="usb_device.product_id" int="0003"> 
    78           <merge key="info.category" type="string">smart_card</merge> 
     76      <match key="usb.vendor_id" int="0x04e6"> 
     77        <match key="usb.product_id" int="0x0003"> 
     78          <merge key="info.category" type="string">smart_card_reader</merge> 
    7979          <append key="info.addons" type="strlist">hald-addon-openct</append> 
    8080        </match> 
    8181      </match> 
    8282 
    83       <match key="usb_device.vendor_id" int="072f"> 
    84         <match key="usb_device.product_id" int="0001"> 
    85           <merge key="info.category" type="string">smart_card</merge> 
     83      <match key="usb.vendor_id" int="0x072f"> 
     84        <match key="usb.product_id" int="0x0001"> 
     85          <merge key="info.category" type="string">smart_card_reader</merge> 
    8686          <append key="info.addons" type="strlist">hald-addon-openct</append> 
    8787        </match> 
    8888      </match> 
    8989 
    90       <match key="usb_device.vendor_id" int="072f"> 
    91         <match key="usb_device.product_id" int="8009"> 
    92           <merge key="info.category" type="string">smart_card</merge> 
     90      <match key="usb.vendor_id" int="0x072f"> 
     91        <match key="usb.product_id" int="0x8009"> 
     92          <merge key="info.category" type="string">smart_card_reader</merge> 
    9393          <append key="info.addons" type="strlist">hald-addon-openct</append> 
    9494        </match> 
    9595      </match> 
    9696 
    97       <match key="usb_device.vendor_id" int="072f"> 
    98         <match key="usb_device.product_id" int="9000"> 
    99           <merge key="info.category" type="string">smart_card</merge> 
     97      <match key="usb.vendor_id" int="0x072f"> 
     98        <match key="usb.product_id" int="0x9000"> 
     99          <merge key="info.category" type="string">smart_card_reader</merge> 
    100100          <append key="info.addons" type="strlist">hald-addon-openct</append> 
    101101        </match> 
    102102      </match> 
    103103 
    104       <match key="usb_device.vendor_id" int="072f"> 
    105         <match key="usb_device.product_id" int="90d0"> 
    106           <merge key="info.category" type="string">smart_card</merge> 
     104      <match key="usb.vendor_id" int="0x072f"> 
     105        <match key="usb.product_id" int="0x90d0"> 
     106          <merge key="info.category" type="string">smart_card_reader</merge> 
    107107          <append key="info.addons" type="strlist">hald-addon-openct</append> 
    108108        </match> 

  • trunk/etc/openct.hald.in

    r895 r998  
    11#!/bin/bash 
    22 
    3 PRODUCT="$HAL_PROP_USB_DEVICE_VENDOR_ID/$HAL_PROP_USB_DEVICE_PRODUCT_ID" 
     3PRODUCT="`printf %x/%x/%x $HAL_PROP_USB_VENDOR_ID $HAL_PROP_USB_PRODUCT_ID \ 
     4        $HAL_PROP_USB_DEVICE_REVISION_BCD`" 
    45 
    5 DEVICE=`printf /dev/bus/usb/%03u/%03u \ 
    6         $HAL_PROP_USB_DEVICE_BUS_NUMBER \ 
    7         $HAL_PROP_USB_DEVICE_LINUX_DEVICE_NUMBER` 
     6DEVICE="`printf /dev/bus/usb/%03u/%03u \ 
     7        $HAL_PROP_USB_BUS_NUMBER $HAL_PROP_USB_LINUX_DEVICE_NUMBER`" 
    88 
    99if test -e $DEVICE 
    … …  
    1212fi 
    1313 
    14 DEVICE=`printf /proc/bus/usb/%03u/%03u \ 
    15         $HAL_PROP_USB_DEVICE_BUS_NUMBER \ 
    16         $HAL_PROP_USB_DEVICE_LINUX_DEVICE_NUMBER` 
     14DEVICE="`printf /proc/bus/usb/%03u/%03u \ 
     15        $HAL_PROP_USB_BUS_NUMBER $HAL_PROP_USB_LINUX_DEVICE_NUMBER`" 
    1716exec SBINDIR/openct-control attach usb:$PRODUCT usb $DEVICE