d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build after recent DWC OTG changes.

Browse Source
This commit is contained in:
Hans Petter Selasky 2014-05-18 09:29:00 +00:00
parent e85f0d3141
commit 3b4c173b83
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/boot/usb/bsd_kernel.c
View File

@ -380,8 +380,10 @@ device_get_parent(device_t dev)
}
void
device_set_interrupt(device_t dev, intr_fn_t *fn, void *arg)
device_set_interrupt(device_t dev, driver_filter_t *filter,
driver_intr_t *fn, void *arg)
{
dev->dev_irq_filter = filter;
dev->dev_irq_fn = fn;
dev->dev_irq_arg = arg;
}
@ -395,8 +397,16 @@ device_run_interrupts(device_t parent)
return;
TAILQ_FOREACH(child, &parent->dev_children, dev_link) {
if (child->dev_irq_fn != NULL)
(child->dev_irq_fn) (child->dev_irq_arg);
int status;
if (child->dev_irq_filter != NULL)
status = child->dev_irq_filter(child->dev_irq_arg);
else
status = FILTER_SCHEDULE_THREAD;
if (status == FILTER_SCHEDULE_THREAD) {
if (child->dev_irq_fn != NULL)
(child->dev_irq_fn) (child->dev_irq_arg);
}
}
}

14
sys/boot/usb/bsd_kernel.h
View File

@ -96,6 +96,7 @@ SYSINIT_ENTRY(uniq##_entry, "sysuninit", (subs), \
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
#define MAX(a,b) (((a) > (b)) ? (a) : (b))
#define MTX_DEF 0
#define MTX_SPIN 0
#define MTX_RECURSE 0
#define SX_DUPOK 0
#define SX_NOWITNESS 0
@ -201,6 +202,8 @@ struct mtx {
void mtx_init(struct mtx *, const char *, const char *, int);
void mtx_lock(struct mtx *);
void mtx_unlock(struct mtx *);
#define mtx_lock_spin(x) mtx_lock(x)
#define mtx_unlock_spin(x) mtx_unlock(x)
int mtx_owned(struct mtx *);
void mtx_destroy(struct mtx *);
@ -266,7 +269,11 @@ struct module_data;
typedef struct driver driver_t;
typedef struct devclass *devclass_t;
typedef struct device *device_t;
typedef void (intr_fn_t)(void *arg);
typedef void (driver_intr_t)(void *arg);
typedef int (driver_filter_t)(void *arg);
#define FILTER_STRAY 0x01
#define FILTER_HANDLED 0x02
#define FILTER_SCHEDULE_THREAD 0x04
typedef int device_attach_t (device_t dev);
typedef int device_detach_t (device_t dev);
@ -294,7 +301,8 @@ struct device {
const struct module_data *dev_module;
void *dev_sc;
void *dev_aux;
intr_fn_t *dev_irq_fn;
driver_filter_t *dev_irq_filter;
driver_intr_t *dev_irq_fn;
void *dev_irq_arg;
uint16_t dev_unit;
@ -341,7 +349,7 @@ const char *device_get_nameunit(device_t dev);
printf("%s: " fmt, device_get_nameunit(dev),## __VA_ARGS__)
device_t device_add_child(device_t dev, const char *name, int unit);
void device_quiet(device_t dev);
void device_set_interrupt(device_t dev, intr_fn_t *fn, void *arg);
void device_set_interrupt(device_t dev, driver_filter_t *, driver_intr_t *, void *);
void device_run_interrupts(device_t parent);
void device_set_ivars(device_t dev, void *ivars);
void *device_get_ivars(device_t dev);