diff options
| -rw-r--r-- | drivers/dahdi/xpp/xdefs.h | 5 | ||||
| -rw-r--r-- | drivers/dahdi/xpp/xproto.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/dahdi/xpp/xdefs.h b/drivers/dahdi/xpp/xdefs.h index a50657f..3c2edf2 100644 --- a/drivers/dahdi/xpp/xdefs.h +++ b/drivers/dahdi/xpp/xdefs.h @@ -102,7 +102,6 @@ struct list_head { #define CHAN_BITS 5 /* 0-31 for E1 */ typedef char *charp; -typedef unsigned char byte; #ifdef __KERNEL__ /* Kernel versions... */ @@ -171,8 +170,8 @@ typedef struct xpd xpd_t; typedef struct xframe xframe_t; typedef struct xpacket xpacket_t; typedef __u32 xpp_line_t; /* at most 31 lines for E1 */ -typedef byte lineno_t; -typedef byte xportno_t; +typedef __u8 lineno_t; +typedef __u8 xportno_t; #define PORT_BROADCAST 255 diff --git a/drivers/dahdi/xpp/xproto.h b/drivers/dahdi/xpp/xproto.h index b57731f..cdfb018 100644 --- a/drivers/dahdi/xpp/xproto.h +++ b/drivers/dahdi/xpp/xproto.h @@ -81,7 +81,7 @@ struct xpacket_header { #define XPD_TYPE_ECHO 5 // Octasic echo canceller #define XPD_TYPE_NOMODULE 7 -typedef byte xpd_type_t; +typedef __u8 xpd_type_t; #define XPD_TYPE_PREFIX "xpd-type-" @@ -168,7 +168,7 @@ bool valid_xpd_addr(const struct xpd_addr *addr); #define MULTIBYTE_MAX_LEN 5 /* FPGA firmware limitation */ typedef struct reg_cmd { - byte bytes:3; /* Length (for Multibyte) */ + __u8 bytes:3; /* Length (for Multibyte) */ __u8 eoframe:1; /* For BRI -- end of frame */ __u8 portnum:3; /* For port specific registers */ __u8 is_multibyte:1; |