summaryrefslogtreecommitdiff
path: root/xpp/xpd.h
diff options
context:
space:
mode:
Diffstat (limited to 'xpp/xpd.h')
-rw-r--r--xpp/xpd.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/xpp/xpd.h b/xpp/xpd.h
index 3187227..8c7c514 100644
--- a/xpp/xpd.h
+++ b/xpp/xpd.h
@@ -91,12 +91,14 @@ typedef unsigned gfp_t; /* Added in 2.6.14 */
struct card_desc_struct {
struct list_head card_list;
u32 magic;
- xbus_t *xbus;
- byte rev; /* Revision number */
byte type; /* LSB: 1 - to_phone, 0 - to_line */
byte subtype;
struct xpd_addr xpd_addr;
- xpp_line_t line_status; /* Initial line status (offhook) */
+ byte numchips;
+ byte ports_per_chip;
+ byte ports;
+ byte port_dir;
+ struct xpd_addr ec_addr; /* echo canceler address */
};
typedef enum xpd_direction {
@@ -139,12 +141,12 @@ struct xpd {
char xpdname[XPD_NAMELEN];
struct zt_span span;
struct zt_chan *chans;
- int channels;
+ int channels;
xpd_type_t type;
const char *type_name;
byte subtype;
- byte revision; /* Card revision */
xpd_direction_t direction; /* TO_PHONE, TO_PSTN */
+ int subunits; /* all siblings */
xpp_line_t no_pcm; /* Temporary: disable PCM (for USB-1) */
xpp_line_t offhook; /* Actual chip state: 0 - ONHOOK, 1 - OFHOOK */
xpp_line_t cid_on;
@@ -177,6 +179,7 @@ struct xpd {
struct proc_dir_entry *proc_xpd_summary;
struct proc_dir_entry *proc_xpd_ztregister;
struct proc_dir_entry *proc_xpd_blink;
+ struct proc_dir_entry *proc_xpd_chipregs;
#endif
int counters[XPD_COUNTER_MAX];
@@ -199,7 +202,7 @@ struct xpd {
};
#define for_each_line(xpd,i) for((i) = 0; (i) < (xpd)->channels; (i)++)
-#define IS_BRI(xpd) ((xpd)->type == XPD_TYPE_BRI_NT || (xpd)->type == XPD_TYPE_BRI_TE)
+#define IS_BRI(xpd) ((xpd)->type == XPD_TYPE_BRI)
#define TICK_TOLERANCE 500 /* usec */
#ifdef DEBUG_SYNC_PARPORT