Skip to content

Commit 1413d76

Browse files
prashantrarprashantrar
committed
Fixing merge issues
1 parent 149e443 commit 1413d76

File tree

46 files changed

+0
-2839
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+0
-2839
lines changed

‎features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_Realtek/lwipopts_conf.h

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,32 +20,15 @@
2020
#define LWIPOPTS_CONF_H
2121

2222
#define LWIP_TRANSPORT_ETHERNET 1
23-
<<<<<<< HEAD
24-
#define ETHMEM_SECTIO
25-
26-
//#define TCPIP_THREAD_STACKSIZE 2048
27-
=======
2823
#define ETHMEM_SECTION
29-
>>>>>>> upstream/master
3024

3125
/* ---------- Pbuf options ---------- */
3226
#define MEM_SIZE (10*1600)
3327
#define TCP_SND_QUEUELEN 60
3428
#define MEMP_NUM_TCP_SEG TCP_SND_QUEUELEN
35-
<<<<<<< HEAD
36-
#define TCP_MSS 1460
37-
#define TCP_SND_BUF (10 * TCP_MSS)
38-
#define TCP_WND (6 * TCP_MSS)
39-
#define PBUF_POOL_SIZE 10
40-
#define TCPIP_THREAD_STACKSIZE 1600
41-
#endif
42-
43-
44-
=======
4529
#define TCP_MSS 1460
4630
#define TCP_SND_BUF (10 * TCP_MSS)
4731
#define TCP_WND (6 * TCP_MSS)
4832
#define PBUF_POOL_SIZE 10
4933

5034
#endif
51-
>>>>>>> upstream/master

‎features/FEATURE_LWIP/lwip-interface/lwipopts.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,21 +94,16 @@
9494
#define DEFAULT_RAW_RECVMBOX_SIZE 8
9595
#define DEFAULT_ACCEPTMBOX_SIZE 8
9696

97-
<<<<<<< HEAD
98-
#ifndef TCPIP_THREAD_STACKSIZE
99-
=======
10097
// Thread stack size for lwip tcpip thread
10198
#ifndef MBED_CONF_LWIP_TCPIP_THREAD_STACKSIZE
10299
#define MBED_CONF_LWIP_TCPIP_THREAD_STACKSIZE 1200
103100
#endif
104101

105-
>>>>>>> upstream/master
106102
#ifdef LWIP_DEBUG
107103
#define TCPIP_THREAD_STACKSIZE MBED_CONF_LWIP_TCPIP_THREAD_STACKSIZE*2
108104
#else
109105
#define TCPIP_THREAD_STACKSIZE MBED_CONF_LWIP_TCPIP_THREAD_STACKSIZE
110106
#endif
111-
#endif
112107

113108
#define TCPIP_THREAD_PRIO (osPriorityNormal)
114109

@@ -123,12 +118,8 @@
123118
#endif
124119

125120
#ifdef LWIP_DEBUG
126-
<<<<<<< HEAD
127-
#define DEFAULT_THREAD_STACKSIZE 1024*2
128-
=======
129121
#define DEFAULT_THREAD_STACKSIZE MBED_CONF_LWIP_DEFAULT_THREAD_STACKSIZE*2
130122
#define PPP_THREAD_STACK_SIZE MBED_CONF_LWIP_PPP_THREAD_STACKSIZE*2
131-
>>>>>>> upstream/master
132123
#else
133124
#define DEFAULT_THREAD_STACKSIZE MBED_CONF_LWIP_DEFAULT_THREAD_STACKSIZE
134125
#define PPP_THREAD_STACK_SIZE MBED_CONF_LWIP_PPP_THREAD_STACKSIZE

‎targets/TARGET_Realtek/TARGET_AMEBA/RTWInterface.cpp

Lines changed: 0 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,7 @@
2828
#include "osdep_service.h"
2929

3030
typedef struct _wifi_scan_hdl {
31-
<<<<<<< HEAD
32-
void *scan_sema;
33-
=======
3431
_sema scan_sema;
35-
>>>>>>> upstream/master
3632
nsapi_size_t ap_num;
3733
nsapi_size_t scan_num;
3834
WiFiAccessPoint *ap_details;
@@ -87,60 +83,24 @@ static rtw_result_t scan_result_handler( rtw_scan_handler_result_t* malloced_sca
8783
return RTW_SUCCESS;
8884
}
8985

90-
<<<<<<< HEAD
91-
static bool rtw_ipv4_is_valid(const char *addr)
92-
{
93-
int i = 0;
94-
int dot = 0;
95-
96-
// Check each digit for [0-9.]
97-
for (; addr[i]; i++) {
98-
if (!(addr[i] >= '0' && addr[i] <= '9') && addr[i] != '.') {
99-
return false;
100-
}
101-
if(addr[i] == '.' && addr[i+1] != '.')
102-
dot++;
103-
}
104-
105-
// Ending with '.' garuntees host
106-
if ((i > 0 && addr[i-1] == '.') || dot != 3) {
107-
return false;
108-
}
109-
110-
return true;
111-
}
112-
113-
RTWInterface::RTWInterface()
114-
=======
11586
RTWInterface::RTWInterface(bool debug)
116-
>>>>>>> upstream/master
11787
: _dhcp(true), _ip_address(), _netmask(), _gateway()
11888
{
11989
emac_interface_t *emac;
12090
int ret;
121-
<<<<<<< HEAD
122-
123-
emac = wlan_emac_init_interface();
124-
if (!emac) {
125-
printf("Error init RTWInterface!\r\n");
126-
=======
12791
extern u32 GlobalDebugEnable;
12892

12993
GlobalDebugEnable = debug?1:0;
13094
emac = wlan_emac_init_interface();
13195
if (!emac) {
13296
printf("Error init RTWInterface!\r\n");
13397
return;
134-
>>>>>>> upstream/master
13598
}
13699
emac->ops.power_up(emac);
137100
ret = mbed_lwip_init(emac);
138101
if (ret != 0) {
139102
printf("Error init RTWInterface!(%d)\r\n", ret);
140-
<<<<<<< HEAD
141-
=======
142103
return;
143-
>>>>>>> upstream/master
144104
}
145105
}
146106

@@ -152,17 +112,10 @@ RTWInterface::~RTWInterface()
152112

153113
nsapi_error_t RTWInterface::set_network(const char *ip_address, const char *netmask, const char *gateway)
154114
{
155-
<<<<<<< HEAD
156-
strncpy(_ip_address, ip_address ? ip_address : "", sizeof(_ip_address));
157-
strncpy(_netmask, netmask ? netmask : "", sizeof(_netmask));
158-
strncpy(_gateway, gateway ? gateway : "", sizeof(_gateway));
159-
_dhcp = false;
160-
=======
161115
_dhcp = false;
162116
strncpy(_ip_address, ip_address ? ip_address : "", sizeof(_ip_address));
163117
strncpy(_netmask, netmask ? netmask : "", sizeof(_netmask));
164118
strncpy(_gateway, gateway ? gateway : "", sizeof(_gateway));
165-
>>>>>>> upstream/master
166119
return NSAPI_ERROR_OK;
167120
}
168121

@@ -196,15 +149,7 @@ nsapi_error_t RTWInterface::connect()
196149

197150
switch (_security) {
198151
case NSAPI_SECURITY_WPA:
199-
<<<<<<< HEAD
200-
sec = RTW_SECURITY_WPA_TKIP_PSK;
201-
break;
202152
case NSAPI_SECURITY_WPA2:
203-
sec = RTW_SECURITY_WPA2_AES_PSK;
204-
break;
205-
=======
206-
case NSAPI_SECURITY_WPA2:
207-
>>>>>>> upstream/master
208153
case NSAPI_SECURITY_WPA_WPA2:
209154
sec = RTW_SECURITY_WPA_WPA2_MIXED;
210155
break;
@@ -218,25 +163,7 @@ nsapi_error_t RTWInterface::connect()
218163
return NSAPI_ERROR_PARAMETER;
219164
}
220165

221-
<<<<<<< HEAD
222-
if(!_dhcp){
223-
#if LWIP_IPV4
224-
if (!rtw_ipv4_is_valid(_ip_address) ||
225-
!rtw_ipv4_is_valid(_netmask) ||
226-
!rtw_ipv4_is_valid(_gateway)) {
227-
return NSAPI_ERROR_PARAMETER;
228-
}
229-
#endif
230-
}
231-
232-
if(_channel > 13){
233-
return NSAPI_ERROR_PARAMETER;
234-
}
235-
236-
if(_channel != 0){
237-
=======
238166
if(_channel > 0 && _channel < 14){
239-
>>>>>>> upstream/master
240167
uint8_t pscan_config = PSCAN_ENABLE;
241168
wifi_set_pscan_chan(&_channel, &pscan_config, 1);
242169
}
@@ -248,27 +175,13 @@ nsapi_error_t RTWInterface::connect()
248175
}
249176

250177
wlan_emac_link_change(true);
251-
<<<<<<< HEAD
252-
ret = mbed_lwip_bringup(_dhcp,
253-
_ip_address[0] ? _ip_address : 0,
254-
_netmask[0] ? _netmask : 0,
255-
_gateway[0] ? _gateway : 0);
256-
if(ret != NSAPI_ERROR_OK){
257-
disconnect();
258-
}
259-
return ret;
260-
}
261-
262-
nsapi_error_t RTWInterface::scan(WiFiAccessPoint *res, nsapi_size_t count)
263-
=======
264178
return mbed_lwip_bringup(_dhcp,
265179
_ip_address[0] ? _ip_address : 0,
266180
_netmask[0] ? _netmask : 0,
267181
_gateway[0] ? _gateway : 0);
268182
}
269183

270184
nsapi_error_t RTWInterface::scan(WiFiAccessPoint *res, unsigned count)
271-
>>>>>>> upstream/master
272185
{
273186
static wifi_scan_hdl scan_handler;
274187
scan_handler.ap_num = 0;
@@ -284,11 +197,7 @@ nsapi_error_t RTWInterface::scan(WiFiAccessPoint *res, unsigned count)
284197
printf("wifi scan timeout\r\n");
285198
return NSAPI_ERROR_DEVICE_ERROR;
286199
}
287-
<<<<<<< HEAD
288-
if(count == 0 || count > scan_handler.ap_num)
289-
=======
290200
if(count <= 0 || count > scan_handler.ap_num)
291-
>>>>>>> upstream/master
292201
count = scan_handler.ap_num;
293202

294203
return count;
@@ -319,11 +228,7 @@ nsapi_error_t RTWInterface::connect(const char *ssid, const char *pass,
319228
nsapi_error_t RTWInterface::disconnect()
320229
{
321230
char essid[33];
322-
<<<<<<< HEAD
323-
mbed_lwip_bringdown();
324-
=======
325231

326-
>>>>>>> upstream/master
327232
wlan_emac_link_change(false);
328233
if(wifi_is_connected_to_ap() != RTW_SUCCESS)
329234
return NSAPI_ERROR_NO_CONNECTION;

‎targets/TARGET_Realtek/TARGET_AMEBA/RTWInterface.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,7 @@ class RTWInterface: public WiFiInterface
3434
public:
3535
/** RTWWlanInterface lifetime
3636
*/
37-
<<<<<<< HEAD
38-
RTWInterface();
39-
=======
4037
RTWInterface(bool debug=false);
41-
>>>>>>> upstream/master
4238
~RTWInterface();
4339

4440
/** Set a static IP address
@@ -110,11 +106,7 @@ class RTWInterface: public WiFiInterface
110106
* @return Number of entries in @a, or if @a count was 0 number of available networks, negative on error
111107
* see @a nsapi_error
112108
*/
113-
<<<<<<< HEAD
114-
virtual nsapi_size_or_error_t scan(WiFiAccessPoint *res, nsapi_size_t count);
115-
=======
116109
virtual nsapi_size_or_error_t scan(WiFiAccessPoint *res, unsigned count);
117-
>>>>>>> upstream/master
118110

119111
virtual nsapi_error_t set_channel(uint8_t channel);
120112
virtual int8_t get_rssi();

‎targets/TARGET_Realtek/TARGET_AMEBA/TARGET_RTL8195A/PinNames.h

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,7 @@ typedef enum {
5050
PIN_OUTPUT
5151
} PinDirection;
5252

53-
<<<<<<< HEAD
54-
=======
5553

56-
>>>>>>> upstream/master
5754
typedef enum {
5855
PA_0 = (PORT_A<<4|0),
5956
PA_1 = (PORT_A<<4|1),
@@ -162,21 +159,14 @@ typedef enum {
162159
PK_5 = (PORT_K<<4|5),
163160
PK_6 = (PORT_K<<4|6),
164161
/* unavailable pins */
165-
<<<<<<< HEAD
166-
// PK_7 = (PORT_K<<4|7),
167-
=======
168162
// PK_7 = (PORT_K<<4|7),
169-
>>>>>>> upstream/master
170163

171164
AD_1 = (PORT_V<<4|1),
172165
AD_2 = (PORT_V<<4|2),
173166
AD_3 = (PORT_V<<4|3),
174167

175168
DA_0 = (PORT_U<<4|0),
176169
DA_1 = (PORT_U<<4|1),
177-
<<<<<<< HEAD
178-
179-
=======
180170

181171
// Not connected
182172
NC = (uint32_t)0xFFFFFFFF,
@@ -199,20 +189,15 @@ typedef enum {
199189
SPI_CS = PC_0,
200190
PWM_OUT = PD_4,
201191

202-
>>>>>>> upstream/master
203192
// Arduino connector namings
204193

205194
A0 = AD_2,//A0 and A1 are connected
206195
A1 = AD_2,
207196
A2 = AD_3,
208-
<<<<<<< HEAD
209-
210-
=======
211197
A3 = NC,
212198
A4 = NC,
213199
A5 = NC,
214200

215-
>>>>>>> upstream/master
216201
D0 = PA_6,
217202
D1 = PA_7,
218203
D2 = PA_5,
@@ -229,39 +214,10 @@ typedef enum {
229214
D13 = PC_1,
230215
D14 = PB_3,
231216
D15 = PB_2,
232-
<<<<<<< HEAD
233-
234-
D16 = PA_1,
235-
D17 = PA_0,
236-
D18 = PE_5,
237-
238-
239-
// Generic signals namings
240-
/* LED1~4 are defined as alias of GPIO pins, they are not the LEDs on board*/
241-
LED1 = PB_4,
242-
LED2 = PB_5,
243-
LED3 = PB_6,
244-
LED4 = PB_7,
245-
SERIAL_TX = PA_7,
246-
SERIAL_RX = PA_6,
247-
USBTX = PB_0,
248-
USBRX = PB_1,
249-
I2C_SCL = PC_5,
250-
I2C_SDA = PC_4,
251-
SPI_MOSI = PC_2,
252-
SPI_MISO = PC_3,
253-
SPI_SCK = PC_1,
254-
SPI_CS = PC_0,
255-
PWM_OUT = PD_4,
256-
257-
// Not connected
258-
NC = (uint32_t)0xFFFFFFFF
259-
=======
260217
D16 = PA_1,
261218
D17 = PA_0,
262219
D18 = PE_5
263220

264-
>>>>>>> upstream/master
265221
} PinName;
266222

267223
typedef enum {

0 commit comments

Comments
 (0)