diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2011-03-03 12:42:31 -0600 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2011-04-15 14:21:14 -0500 |
| commit | f900e1f229bbd4e04229052b18a1dc6cacbb0e52 (patch) | |
| tree | 88000a1a498af9c4b15324a7275f50a46bf2e667 /include | |
| parent | 3080253725eb7a1ba1cec08735c1476a3fd3c1c7 (diff) | |
dahdi: Move irq/irqmisses from dahdi_span into dahdi_device.
These fields do not have anything to do with the span.
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/dahdi/kernel.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index b05ed8d..c1f5b49 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -886,6 +886,8 @@ struct dahdi_span_ops { * @manufacturer: Device manufacturer. * @location: The location of this device * @devicetype: What type of device this is. + * @irqmisses: Count of "interrupt misses" for this device. + * @irq: The interrupt line (if any) for this device. * */ struct dahdi_device { @@ -894,6 +896,8 @@ struct dahdi_device { const char *location; const char *devicetype; struct device dev; + unsigned int irqmisses; + u8 irq; }; struct dahdi_span { @@ -905,7 +909,6 @@ struct dahdi_span { int alarms; /*!< Pending alarms on span */ unsigned long flags; u8 cannot_provide_timing:1; - int irq; /*!< IRQ for this span's hardware */ int lbo; /*!< Span Line-Buildout */ int lineconfig; /*!< Span line configuration */ int linecompat; /*!< Span line compatibility (0 for @@ -919,7 +922,6 @@ struct dahdi_span { enum dahdi_maint_mode maintstat; /*!< Maintenance state */ int mainttimer; /*!< Maintenance timer */ - int irqmisses; /*!< Interrupt misses */ int timingslips; /*!< Clock slips */ struct dahdi_chan **chans; /*!< Member channel structures */ |