A problem with header file sonet.h

[Charles Trois]

Hello, may I submit this problem to the list?

I am trying out speedbundle-1.0, the new package that installs the software
for the Alcatel SpeedTouch USB modem.

When I run make in the speedbundle-1.0 directory, it fails; here are the
last lines of the log:

<begin quote>
Making all in maint
make[4]: Entering directory
`/home/travaux/adsl/speedbundle-1.0/linux-atm/src/maint'
gcc -DHAVE_CONFIG_H -I. -I. -I../.. -I../../src/qgen -I../../src/saal -I.
-I../../src/include -g -O2 -Wall -Wshadow -Wpointer-arith -Wwrite-strings
-Wstrict-prototypes -c sonetdiag.c
In file included from sonetdiag.c:18:
/usr/include/linux/sonet.h:65: parse error before "__SONET_ITEMS"
make[4]: *** [sonetdiag.o] Error 1
make[4]: Leaving directory
`/home/travaux/adsl/speedbundle-1.0/linux-atm/src/maint'
make[3]: *** [all-recursive] Error 1
make[3]: Leaving directory
`/home/travaux/adsl/speedbundle-1.0/linux-atm/src'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/home/travaux/adsl/speedbundle-1.0/linux-atm'
make[1]: *** [all-recursive-am] Error 2
make[1]: Leaving directory `/home/travaux/adsl/speedbundle-1.0/linux-atm'
make: *** [build-stamp] Error 2
<end quote>

>From that, it appears that there is something wrong in my copy of sonet.h
(which comes from YDL 3.0).

Hence my two questions:

1.  How can I get hold of a clean copy of this sonet.h file?

2.  Alternatively, I could try to put things right by editing the file.
Although I have some knowledge of C, I cannot spot the error(s). Below is
the copy of my sonet.h, in case someone more experienced than me can see the
solution.

All help will be appreciated.

Charles

<begin sonet.h>
/* sonet.h - SONET/SHD physical layer control */
 
/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
 

#ifndef LINUX_SONET_H
#define LINUX_SONET_H
/*g*/
#define __SONET_ITEMS \
    __HANDLE_ITEM(section_bip);     /* section parity errors (B1) */ \
    __HANDLE_ITEM(line_bip);        /* line parity errors (B2) */ \
    __HANDLE_ITEM(path_bip);        /* path parity errors (B3) */ \
    __HANDLE_ITEM(line_febe);        /* line parity errors at remote */ \
    __HANDLE_ITEM(path_febe);        /* path parity errors at remote */ \
    __HANDLE_ITEM(corr_hcs);        /* correctable header errors */ \
    __HANDLE_ITEM(uncorr_hcs);        /* uncorrectable header errors */ \
    __HANDLE_ITEM(tx_cells);        /* cells sent */ \
    __HANDLE_ITEM(rx_cells)    /* cells received */

struct sonet_stats {
#define __HANDLE_ITEM(i) int i
    __SONET_ITEMS
#undef __HANDLE_ITEM
} __attribute__ ((packed));


#define SONET_GETSTAT    _IOR('a',ATMIOC_PHYTYP,struct sonet_stats)
                    /* get statistics */
#define SONET_GETSTATZ    _IOR('a',ATMIOC_PHYTYP+1,struct sonet_stats)
                    /* ... and zero counters */
#define SONET_SETDIAG    _IOWR('a',ATMIOC_PHYTYP+2,int)
                    /* set error insertion */
#define SONET_CLRDIAG    _IOWR('a',ATMIOC_PHYTYP+3,int)
                    /* clear error insertion */
#define SONET_GETDIAG    _IOR('a',ATMIOC_PHYTYP+4,int)
                    /* query error insertion */
#define SONET_SETFRAMING _IO('a',ATMIOC_PHYTYP+5)
                    /* set framing mode (SONET/SDH) */
#define SONET_GETFRAMING _IOR('a',ATMIOC_PHYTYP+6,int)
                    /* get framing mode */
#define SONET_GETFRSENSE _IOR('a',ATMIOC_PHYTYP+7, \
  unsigned char[SONET_FRSENSE_SIZE])    /* get framing sense information */

#define SONET_INS_SBIP      1        /* section BIP */
#define SONET_INS_LBIP      2        /* line BIP */
#define SONET_INS_PBIP      4        /* path BIP */
#define SONET_INS_FRAME      8        /* out of frame */
#define SONET_INS_LOS     16        /* set line to zero */
#define SONET_INS_LAIS     32        /* line alarm indication signal */
#define SONET_INS_PAIS     64        /* path alarm indication signal */
#define SONET_INS_HCS    128        /* insert HCS error */

#define SONET_FRAME_SONET 0        /* SONET STS-3 framing */
#define SONET_FRAME_SDH   1        /* SDH STM-1 framing */

#define SONET_FRSENSE_SIZE 6        /* C1[3],H1[3] (0xff for unknown) */

#undef __SONET_ITEMS
/*#undef __SONET_ITEMS*/

#include <asm/atomic.h>

struct k_sonet_stats {
#define __HANDLE_ITEM(i) atomic_t i
    __SONET_ITEMS
#undef __HANDLE_ITEM
};

extern void sonet_copy_stats(struct k_sonet_stats *from,struct sonet_stats
*to);
extern void sonet_subtract_stats(struct k_sonet_stats *from,
    struct sonet_stats *to);

#endif

/*#endif*/
<end sonet.h>