Skip to content

Commit 085e1e1

Browse files
jh6186Kimmo Vaisanen
authored andcommitted
Clean up Warning round ARMmbed#2
Signed-off-by: PARKJIHOON <[email protected]>
1 parent ee98a8c commit 085e1e1

File tree

10 files changed

+21
-17
lines changed

10 files changed

+21
-17
lines changed

targets/TARGET_Samsung/TARGET_SIDK_S5JS100/device/s5js100_systemreset.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ static mbed_error_status_t handle_error(mbed_error_status_t error_status, unsign
300300
#define CONTAINER_OF(ptr, type, field) \
301301
((type *)(((char *)(ptr)) - offsetof(type, field)))
302302

303-
int mbed_error(int error_status, const char *error_msg, unsigned int error_value, const char *filename, int line_number)
303+
mbed_error_status_t mbed_error(int error_status, const char *error_msg, unsigned int error_value, const char *filename, int line_number)
304304
{
305305
int i;
306306
uint32_t current_psp;
@@ -328,7 +328,5 @@ int mbed_error(int error_status, const char *error_msg, unsigned int error_value
328328
mbed_error_printf("0x%.8x ", getreg32(current_psp));
329329
}
330330
mbed_error_printf("\n======================FOR ERROR DUMP ========================= \n");
331-
332331
while (1);
333-
return 0;
334332
}

targets/TARGET_Samsung/TARGET_SIDK_S5JS100/device/system_core_s5js100.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ void SystemCoreConfig()
149149

150150
const uint32_t *src;
151151
uint32_t *dest, size;
152-
uint32_t vector;
153152

154153
#if defined ( __ICCARM__ )
155154
src = &__vector_table;

targets/TARGET_Samsung/TARGET_SIDK_S5JS100/gpio_api.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#define GetBits(uAddr, uBaseBit, uMaskValue) \
3838
((getreg32(uAddr)>>(uBaseBit))&(uMaskValue))
3939
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
40+
int gpio_pin_mode(PinName pin, PinMode mode);
4041
uint32_t get_tmux_addr(enum gpio_id_ id)
4142
{
4243
uint32_t i;

targets/TARGET_Samsung/TARGET_SIDK_S5JS100/modem/modem_io_device.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class ModemIoDevice {
4444

4545
public:
4646
virtual void IoReadCallback(mio_buf *) { }
47-
virtual void open(void) { }
47+
virtual void open(void) { }
4848
virtual void close(void) { }
4949
virtual int read(char *buffer, int buflen)
5050
{

targets/TARGET_Samsung/TARGET_SIDK_S5JS100/modem/modem_link_device_shmem.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@ void msg_rx_work(void)
952952

953953
while (1) {
954954
ld = pShmemLinkDevice;
955-
ld->ipc_rx_sem->wait();
955+
ld->ipc_rx_sem->try_acquire();
956956

957957
while (!(ld->ipc_rxq.empty())) {
958958
MODEM_LINK_DEVICE_SHMEM_DBG("%s:%d", __func__, __LINE__);

targets/TARGET_Samsung/TARGET_SIDK_S5JS100/modem/shmem_save.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,10 @@ void shmem_get_data(unsigned int *cs, unsigned int *nv, unsigned int *cal)
125125
unsigned int i;
126126
shmem_section_data *m;
127127
unsigned int ret[3] = {0, 0, 0};
128-
unsigned int FLASH16MB = 0, oldstart, oldsize;
129-
unsigned int psize, poffset;
130-
unsigned char *tmpbuf;
131-
shmem_section_data *tmpsection;
128+
//unsigned int FLASH16MB = 0, oldstart, oldsize;
129+
//unsigned int psize, poffset;
130+
//unsigned char *tmpbuf;
131+
//shmem_section_data *tmpsection;
132132

133133
//initialize SHMEM section depending on FLASH capacity
134134
if (s5js100_sflash_read_capacity() == 16 * 1024 * 1024) {

targets/TARGET_Samsung/TARGET_SIDK_S5JS100/s5js100_pwr.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
#include "mbed_trace.h"
3434
#include "platform/mbed_wait_api.h"
35+
#include "platform/mbed_thread.h"
3536
#define TRACE_GROUP "PWR"
3637

3738
#ifndef S5JS100_PWR_DBG_ON
@@ -386,9 +387,10 @@ void mcpu_init(MCPU_MODE device)
386387
putreg32(getreg32(0x85041204) | (1 << 10), 0x85041204);
387388
putreg32(getreg32(0x8504120C) | (1 << 2), 0x8504120C);
388389
//while (!(getreg32(0x85041200) & (1 << 10)));
389-
wait_ms(10);
390+
//wait_ms(10);
391+
thread_sleep_for(10);
390392
putreg32(getreg32(0x85041200) & 0x3FF, 0x85041204);
391-
if (getreg32(0x85041204) & 0x3FF == 0x0) {
393+
if ((getreg32(0x85041204) & 0x3FF) == 0x0) {
392394
putreg32(0x210, 0x85041204);
393395
}
394396
S5JS100_PWR_DBG("Check 2nd register\n");

targets/TARGET_Samsung/TARGET_SIDK_S5JS100/serial_api.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,6 @@ void serial_init(serial_t *obj, PinName tx, PinName rx)
128128
break;
129129
}
130130

131-
132-
133131
// set default baud rate and format
134132
obj->ops.serial_baud(obj, 115200);
135133
obj->ops.serial_format(obj, 8, ParityNone, 1);
@@ -142,7 +140,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx)
142140

143141
void serial_free(serial_t *obj)
144142
{
145-
#warning "Need to implment serial_free() function."
143+
//needs release serial
146144
}
147145

148146
// serial_baud

targets/TARGET_Samsung/TARGET_SIDK_S5JS100/serial_pl011_api.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include "pinmap.h"
3131
#include "PinNames.h"
3232
#include "mbed_error.h"
33+
#include "mbed_assert.h"
3334
#include "gpio_api.h"
3435

3536
#define UART_PTR(ptr) ((S5JS100_UART_TypeDef *)(ptr))
@@ -122,7 +123,7 @@ static void pl011_serial_baud(void *obj, int baudrate)
122123
struct serial_s *priv = (struct serial_s *)obj;
123124
S5JS100_UART_TypeDef *p_PL011_UART = UART_PTR(priv->uart);
124125

125-
uint32_t sclk;
126+
uint32_t sclk = 0;
126127
float div, frac;
127128
switch (priv->index) {
128129
case PL011_UART0_ID:
@@ -132,6 +133,9 @@ static void pl011_serial_baud(void *obj, int baudrate)
132133
case PL011_UART1_ID:
133134
sclk = cal_clk_getrate(d1_uart1);
134135
break;
136+
137+
default:
138+
MBED_ASSERT(false);
135139
}
136140

137141
div = ((float)sclk / (float)(baudrate * 16));

targets/TARGET_Samsung/TARGET_SIDK_S5JS100/serial_usi_api.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434

3535
#include "s5js100.h"
3636
#include "mbed_wait_api.h"
37+
#include "mbed_thread.h"
3738

3839
#define USI_PTR(ptr) ((S5JS100_USI_UART_TypeDef *)(ptr))
3940
static uart_irq_handler irq_handler[USI_MAX_PORTS];
@@ -306,7 +307,8 @@ void usi_serial_init(void *obj, PinName tx, PinName rx)
306307
UART_UFCON_TX_FIFO_RESET | UART_UFCON_RX_FIFO_RESET |
307308
UART_UFCON_FIFO_ENABLE ;
308309

309-
wait_ms(10);
310+
//wait_ms(10);
311+
thread_sleep_for(10);
310312

311313
//Enable TX/RX fifo int/poll mode with RX timeout of 32 bits duration
312314
p_USI_UART->UCON = UART_UCON_RX_TOUT_32FRAMES | UART_UCON_RX_TOUTINT_ENABLE |

0 commit comments

Comments
 (0)