-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathpx_diff
244 lines (240 loc) · 5.57 KB
/
px_diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
diff --git a/apps/boardapi/boardapi.c b/apps/boardapi/boardapi.c
index 98839da..bd00f97 100755
--- a/apps/boardapi/boardapi.c
+++ b/apps/boardapi/boardapi.c
@@ -278,7 +278,7 @@ char * boardapi_getDeviceModelStr(uint32_t model)
switch(CUSTOM_LOGO_ID)
{
case CUSTOM_LOGO_PX:
- return "PX 7402";
+ return "PX 7403";
case CUSTOM_LOGO_ALCOTEL:
return "EOC-MO350-2G";
case CUSTOM_LOGO_DEMO:
@@ -299,6 +299,8 @@ char * boardapi_getDeviceModelStr(uint32_t model)
{
switch(CUSTOM_LOGO_ID)
{
+ case CUSTOM_LOGO_PX:
+ return "PX 7404";
case CUSTOM_LOGO_ALCOTEL:
return "EOC-MI350-2G";
default:
@@ -339,7 +341,15 @@ char * boardapi_getDeviceModelStr(uint32_t model)
}
case WEC_3501I_XD25:
{
- return "WEC-3501I XD25";
+ switch(CUSTOM_LOGO_ID)
+ {
+ case CUSTOM_LOGO_PX:
+ return "PX 6403";
+ case CUSTOM_LOGO_DEMO:
+ case CUSTOM_LOGO_PREVAIL:
+ default:
+ return "WEC-3501I XD25";
+ }
}
case WEC9720EK_XD25:
{
@@ -357,20 +367,76 @@ char * boardapi_getDeviceModelStr(uint32_t model)
}
case WR1004JL:
{
- return "WR1004JL";
+ switch(CUSTOM_LOGO_ID)
+ {
+ case CUSTOM_LOGO_PX:
+ return "PX 7405";
+ case CUSTOM_LOGO_DEMO:
+ case CUSTOM_LOGO_PREVAIL:
+ default:
+ return "WR1004JL";
+ }
}
case WR1004SJL:
{
- return "WR1004SJL";
+ switch(CUSTOM_LOGO_ID)
+ {
+ case CUSTOM_LOGO_PX:
+ return "PX 7406";
+ case CUSTOM_LOGO_DEMO:
+ case CUSTOM_LOGO_PREVAIL:
+ default:
+ return "WR1004SJL";
+ }
}
case WEC_3702I_E4:
{
- return "WEC-3702I E4";
+ switch(CUSTOM_LOGO_ID)
+ {
+ case CUSTOM_LOGO_PX:
+ return "PX 64E";
+ case CUSTOM_LOGO_DEMO:
+ case CUSTOM_LOGO_PREVAIL:
+ default:
+ return "WEC-3702I E4";
+ }
}
case WEC701_E4:
{
- return "WEC701 E4";
+ switch(CUSTOM_LOGO_ID)
+ {
+ case CUSTOM_LOGO_PX:
+ return "PX 74E";
+ case CUSTOM_LOGO_DEMO:
+ case CUSTOM_LOGO_PREVAIL:
+ default:
+ return "WEC701 E4";
+ }
}
+ case WEC701_L4:
+ {
+ switch(CUSTOM_LOGO_ID)
+ {
+ case CUSTOM_LOGO_PX:
+ return "PX 74L";
+ case CUSTOM_LOGO_DEMO:
+ case CUSTOM_LOGO_PREVAIL:
+ default:
+ return "WEC701 L4";
+ }
+ }
+ case WEC701_W4:
+ {
+ switch(CUSTOM_LOGO_ID)
+ {
+ case CUSTOM_LOGO_PX:
+ return "PX 74W";
+ case CUSTOM_LOGO_DEMO:
+ case CUSTOM_LOGO_PREVAIL:
+ default:
+ return "WEC701 W4";
+ }
+ }
default:
{
return "UNKNOWN";
@@ -468,6 +534,12 @@ const char *boardapi_getCnuHfid(uint32_t devType)
case WEC701_E4:
user_HFID = "WEC701-E4";
break;
+ case WEC701_L4:
+ user_HFID = "WEC701-L4";
+ break;
+ case WEC701_W4:
+ user_HFID = "WEC701-W4";
+ break;
default :
user_HFID = "Intellon Enabled Product";
break;
@@ -511,6 +583,8 @@ int boardapi_isCnuTrusted(uint32_t DevType)
case WEC701_C4: /* WEC701 C4 */
case WEC_3702I_E4: /* WEC-3702I E4 */
case WEC701_E4: /* WEC701 E4 */
+ case WEC701_L4:
+ case WEC701_W4:
{
return BOOL_TRUE;
}
@@ -546,7 +620,9 @@ int boardapi_isAr7400Device(uint32_t DevType)
case WEC701_M0:
case WEC701_C2:
case WEC701_C4:
- case WEC701_E4:
+ case WEC701_E4:
+ case WEC701_L4:
+ case WEC701_W4:
{
return BOOL_TRUE;
}
@@ -787,6 +863,14 @@ int boardapi_mapDevModel(int model)
{
return 43;
}
+ case WEC701_L4:
+ {
+ return 44;
+ }
+ case WEC701_W4:
+ {
+ return 45;
+ }
default:
{
return 256;
@@ -904,6 +988,14 @@ int boardapi_umapDevModel(int model)
{
return WEC701_E4;
}
+ case 44:
+ {
+ return WEC701_L4;
+ }
+ case 45:
+ {
+ return WEC701_W4;
+ }
default:
{
return WEC_INVALID;
diff --git a/apps/httpd/Makefile b/apps/httpd/Makefile
index 3602309..98b7550 100755
--- a/apps/httpd/Makefile
+++ b/apps/httpd/Makefile
@@ -12,8 +12,8 @@ CFLAGS +=-g -O2
# Web language select [ZH|EN]
-HTTPD_GUI_LANGUAGE = ZH
-# HTTPD_GUI_LANGUAGE = EN
+#HTTPD_GUI_LANGUAGE = ZH
+ HTTPD_GUI_LANGUAGE = EN
ROOTFSDIR = ${ROOTDIR}/apps/rootfs
SRCDIR = ${ROOTDIR}/apps/httpd/src
diff --git a/apps/httpd/WEB_EN/html/logo_corp.gif b/apps/httpd/WEB_EN/html/logo_corp.gif
index 9359fb2..4e57ff8 100755
Binary files a/apps/httpd/WEB_EN/html/logo_corp.gif and b/apps/httpd/WEB_EN/html/logo_corp.gif differ
diff --git a/apps/include/public.h b/apps/include/public.h
index e524d04..6dd1655 100755
--- a/apps/include/public.h
+++ b/apps/include/public.h
@@ -49,7 +49,7 @@ enum
CUSTOM_LOGO_PX,
CUSTOM_LOGO_ALCOTEL
};
-#define CUSTOM_LOGO_ID CUSTOM_LOGO_DEMO
+#define CUSTOM_LOGO_ID CUSTOM_LOGO_PX
/********************************************************/
/********************************************************/
@@ -282,7 +282,8 @@ enum
WEC_3702I_E4, /* cnu ar6400+rtl8306e */
WEC701_E4, /* cnu ar7411+rtl8306e */
WR1004JLD, /* 2*clt + 1*onu module */
-
+ WEC701_L4, /* cnu ar7411L+rtl8306e */
+ WEC701_W4, /* cnu ar7411L+AR9331+rtl8306e*/
/* 请在中间增加其他枚举定义 */
WEC_INVALID = 0xFE,
WEC_XXXXX = 0xFF
diff --git a/apps/mmead/mmeapi.c b/apps/mmead/mmeapi.c
index 2c7d3ea..ceccbfc 100755
--- a/apps/mmead/mmeapi.c
+++ b/apps/mmead/mmeapi.c
@@ -3432,6 +3432,14 @@ int MME_Atheros_MsgGetPibSpec
{
pDevInfo->DevType = WEC_3702I_E4;
}
+ else if( strcmp(HFID_USER, "WEC701-L4") == 0)
+ {
+ pDevInfo->DevType = WEC701_L4;
+ }
+ else if( strcmp(HFID_USER, "WEC701-W4") == 0)
+ {
+ pDevInfo->DevType = WEC701_W4;
+ }
else
{
/* 非法设备*/