git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
linux
/
synclink.h
diff --git
a/include/linux/synclink.h
b/include/linux/synclink.h
index
2993302
..
0577f52
100644
(file)
--- a/
include/linux/synclink.h
+++ b/
include/linux/synclink.h
@@
-1,7
+1,7
@@
/*
* SyncLink Multiprotocol Serial Adapter Driver
*
/*
* SyncLink Multiprotocol Serial Adapter Driver
*
- * $Id: synclink.h,v 3.1
1 2006/02/06 21:20:29
paulkf Exp $
+ * $Id: synclink.h,v 3.1
3 2006/05/23 18:25:06
paulkf Exp $
*
* Copyright (C) 1998-2000 by Microgate Corporation
*
*
* Copyright (C) 1998-2000 by Microgate Corporation
*
@@
-97,6
+97,8
@@
#define HDLC_TXIDLE_ALT_MARK_SPACE 4
#define HDLC_TXIDLE_SPACE 5
#define HDLC_TXIDLE_MARK 6
#define HDLC_TXIDLE_ALT_MARK_SPACE 4
#define HDLC_TXIDLE_SPACE 5
#define HDLC_TXIDLE_MARK 6
+#define HDLC_TXIDLE_CUSTOM_8 0x10000000
+#define HDLC_TXIDLE_CUSTOM_16 0x20000000
#define HDLC_ENCODING_NRZ 0
#define HDLC_ENCODING_NRZB 1
#define HDLC_ENCODING_NRZ 0
#define HDLC_ENCODING_NRZB 1
@@
-170,6
+172,7
@@
typedef struct _MGSL_PARAMS
#define SYNCLINK_GT_DEVICE_ID 0x0070
#define SYNCLINK_GT4_DEVICE_ID 0x0080
#define SYNCLINK_AC_DEVICE_ID 0x0090
#define SYNCLINK_GT_DEVICE_ID 0x0070
#define SYNCLINK_GT4_DEVICE_ID 0x0080
#define SYNCLINK_AC_DEVICE_ID 0x0090
+#define SYNCLINK_GT2_DEVICE_ID 0x00A0
#define MGSL_MAX_SERIAL_NUMBER 30
/*
#define MGSL_MAX_SERIAL_NUMBER 30
/*