Merge branch 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

[firefly-linux-kernel-4.4.55.git] / drivers / isdn / hardware / mISDN / hfc_multi.h

diff --git a/drivers/isdn/hardware/mISDN/hfc_multi.h b/drivers/isdn/hardware/mISDN/hfc_multi.h
index b0588acbb47d728228651375c4f4ec31f2921fb7..c601f880141e64e766ad470a350a49081b4f78ea 100644 (file)
--- a/drivers/isdn/hardware/mISDN/hfc_multi.h
+++ b/drivers/isdn/hardware/mISDN/hfc_multi.h
@@ -205,18 +205,22 @@ struct hfc_multi {
 
        u_int           slots;  /* number of PCM slots */
        u_int           leds;   /* type of leds */
-       u_int           ledcount; /* used to animate leds */
        u_long          ledstate; /* save last state of leds */
        int             opticalsupport; /* has the e1 board */
                                        /* an optical Interface */
-       int             dslot;  /* channel # of d-channel (E1) default 16 */
+
+       u_int           bmask[32]; /* bitmask of bchannels for port */
+       u_char          dnum[32]; /* array of used dchannel numbers for port */
+       u_char          created[32]; /* what port is created */
+       u_int           activity_tx; /* if there is data TX / RX */
+       u_int           activity_rx; /* bitmask according to port number */
+                                    /* (will be cleared after */
+                                    /* showing led-states) */
+       u_int           flash[8]; /* counter for flashing 8 leds on activity */
 
        u_long          wdcount;        /* every 500 ms we need to */
                                        /* send the watchdog a signal */
        u_char          wdbyte; /* watchdog toggle byte */
-       u_int           activity[8];    /* if there is any action on this */
-                                       /* port (will be cleared after */
-                                       /* showing led-states) */
        int             e1_state; /* keep track of last state */
        int             e1_getclock; /* if sync is retrieved from interface */
        int             syncronized; /* keep track of existing sync interface */
@@ -233,7 +237,6 @@ struct hfc_multi {
         * the bch->channel is equvalent to the hfc-channel
         */
        struct hfc_chan chan[32];
-       u_char          created[8]; /* what port is created */
        signed char     slot_owner[256]; /* owner channel of slot */
 };