← Back to branch summary

~ubuntu-branches/debian/squeeze/hal/squeeze

« back to all changes in this revision

Viewing changes to hald/linux/addons/addon-usb-csr.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2008-05-15 17:15:26 UTC
  • Revision ID: james.westby@ubuntu.com-20080515171526-wj087paax2bmuxwr
Tags: upstream-0.5.11
Import upstream version 0.5.11

Show diffs side-by-side

added added

removed removed

Lines of Context:
hald/linux/addons/addon-usb-csr.c
68
68
static const char *device_udi;
69
69
 
70
70
/* prototypes */
71
 
static struct usb_device *find_device (const char *hal_device_udi, PropertyCacheItem *pci);
 
71
static struct usb_device *find_device (PropertyCacheItem *pci);
72
72
 
73
73
static PropertyCacheItem* 
74
74
property_cache_item_get (const char *hal_device_udi)
129
129
        HAL_DEBUG (("Is dual: %d", is_dual));
130
130
        addr = is_dual? 1<<8 : 0;
131
131
 
132
 
        curr_device = find_device (hal_device_udi, pci);
 
132
        curr_device = find_device (pci);
133
133
        if (curr_device == NULL)        {
134
134
                HAL_ERROR (("Device %s not found", hal_device_udi));
135
135
                return;
170
170
 
171
171
/* TODO: Is it linux-specific way to find the device? */
172
172
static struct usb_device* 
173
 
find_device (const char *hal_device_udi, PropertyCacheItem *pci)
 
173
find_device (PropertyCacheItem *pci)
174
174
{
175
175
        struct usb_bus* curr_bus;
176
176
        char LUdirname[5];
224
224
}
225
225
 
226
226
static void
227
 
device_removed (LibHalContext *ctx, const char *hal_device_udi)
 
227
device_removed (const char *hal_device_udi)
228
228
{
229
229
        /* this device is removed */
230
230
        if (is_the_device (hal_device_udi)) {
245
245
                if (is_removed) {
246
246
                        HAL_DEBUG (("** Main Property %s removed: %s", key, hal_device_udi));
247
247
                        /* probably we'll have to exit if this is our device */
248
 
                        device_removed (ctx, hal_device_udi);
 
248
                        device_removed (hal_device_udi);
249
249
                }
250
250
        } else
251
251
                /* "Secondary" property modified */