Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for Compiler warnings #1532

Closed
wants to merge 29 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
2ae8c77
dont track commit venv directory
sg- Jan 10, 2016
b01d3c9
add notes to readme
sg- Jan 10, 2016
6da4190
[STM B96B_F446VE] HW Control Flow for serial
adustm Jan 29, 2016
6e45daf
Add uVision4 exporters for DISCO-{F051R8, F100RB, F303VC, F407VG}
dinau Jan 30, 2016
2ce7eab
add mbed os defines to mbed targets
sg- Feb 5, 2016
715fca0
add extra mbed identifier. correct duplicate target
sg- Feb 5, 2016
9f28c09
Readme - update ides, add note about progen replacement
0xc0170 Feb 5, 2016
44b9db6
Merge branch 'master' of https://github.com/mbedmicro/mbed into perip…
Jan 5, 2016
88c05ca
Fix for compiler warnings
Feb 9, 2016
22b8abc
Fixed build error
Feb 9, 2016
1b8d317
Merge pull request #1527 from 0xc0170/fix_ide
0xc0170 Feb 10, 2016
66c0620
Merge pull request #1521 from adustm/b_b96b_serial_flow_control
0xc0170 Feb 10, 2016
1b8f2c7
[DISCO-F407VG]:Changed: Default toolchain from uARM to ARM.
dinau Feb 11, 2016
c301abb
Merge pull request #1522 from dinau/disco-uvision4-exporter
0xc0170 Feb 11, 2016
c9cd05f
[sw4stm32] Fix compilation issue while exporting project using onlin…
DanKupiniak Feb 11, 2016
91fae56
Update Teensy3_1 OS_CLOCK
star297 Feb 11, 2016
1c53fe8
Update README.md
sg- Feb 11, 2016
066dc77
Merge pull request #1539 from DanKupiniak/fix_sw4stm32
0xc0170 Feb 12, 2016
333bfa2
Merge pull request #1540 from star297/master
0xc0170 Feb 12, 2016
9e41fec
Merge pull request #1541 from sg-/venv
0xc0170 Feb 12, 2016
05e8585
Merge pull request #1526 from sg-/mbedos-macros
0xc0170 Feb 12, 2016
8abc70e
Fix SAML21J18A.sct
Feb 8, 2016
9dcb51c
Merge branch 'maclobdell-patch-1'
0xc0170 Feb 12, 2016
934a326
Fixed style and build issue
Feb 14, 2016
a736139
Merge branch 'master' of https://github.com/mbedmicro/mbed into perip…
Jan 5, 2016
d578a72
Fix for compiler warnings
Feb 9, 2016
86b8516
Fixed build error
Feb 9, 2016
a8e52a9
Fixed style and build issue
Feb 14, 2016
6102a64
Merge branch 'master' of https://github.com/Parthasarathy/mbed
Feb 14, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed style and build issue
  • Loading branch information
Parthasarathy.S committed Feb 14, 2016
commit a8e52a9fc0d32bfb10cd27ba38a43451f00c46dd
Original file line number Diff line number Diff line change
Expand Up @@ -205,18 +205,18 @@ const struct pwm_pin_channel pwn_pins[] = {
{PA17, PWM_2, 1},
{PA18, PWM_0, 2},
{PA19, PWM_0, 3},
{PA20, PWM_0, 6},
{PA22, PWM_0, 4},
{PA23, PWM_0, 5},
{PA24, PWM_1, 2},
{PA25, PWM_1, 3},
{PA30, PWM_1, 0},
{PA31, PWM_1, 1},
{PB16, PWM_0, 4},
{PB17, PWM_0, 5},
{PB30, PWM_0, 0},
{PB31, PWM_0, 1},
{PA20, PWM_0, 6},
{PA22, PWM_0, 4},
{PA23, PWM_0, 5},
{PA24, PWM_1, 2},
{PA25, PWM_1, 3},
{PA30, PWM_1, 0},
{PA31, PWM_1, 1},
{PB16, PWM_0, 4},
{PB17, PWM_0, 5},
{PB30, PWM_0, 0},
{PB31, PWM_0, 1},

/* Not connected */
{(PinName) NC ,(PWMName) NC ,(uint8_t) NC}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,8 @@ bool dma_is_transfer_complete(int channelid)

if (channel_index >= CONF_MAX_USED_CHANNEL_NUM) {
/* This channel is not active! return zero for now */
// res = 0;
return 0;
// res = 0;
return 0;
}

return (STATUS_OK == dma_get_job_status(&dma_channels[channel_index].resource));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -487,10 +487,9 @@ enum status_code system_clock_source_write_calibration(
{
switch (clock_source) {
case SYSTEM_CLOCK_SOURCE_OSC8M:
if (calibration_value > 0xfff || freq_range > 4)
{
return STATUS_ERR_INVALID_ARG;
}
if (calibration_value > 0xfff || freq_range > 4) {
return STATUS_ERR_INVALID_ARG;
}
SYSCTRL->OSC8M.bit.CALIB = calibration_value;
SYSCTRL->OSC8M.bit.FRANGE = freq_range;
break;
Expand All @@ -510,7 +509,7 @@ enum status_code system_clock_source_write_calibration(
default:
Assert(false);
return STATUS_ERR_INVALID_ARG;
}
}
return STATUS_OK;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ enum status_code system_clock_source_write_calibration(
default:
Assert(false);
return STATUS_ERR_INVALID_ARG;

}

return STATUS_OK;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ void gpio_dir(gpio_t *obj, PinDirection direction)
{
MBED_ASSERT(obj->pin != (PinName)NC);
struct port_config pin_conf;
obj->direction = direction;
obj->direction = direction;
pin_conf.input_pull = (enum port_pin_pull)obj->mode;
pin_conf.powersave = obj->powersave;
switch (direction) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -924,20 +924,20 @@ uint32_t i2c_irq_handler_asynch(i2c_t *obj)
uint32_t event_mask = pI2C_S(obj)->events;

/* TODO: Current implementation is interrupt based only */

switch (pI2C_S(obj)->master.status) {
case STATUS_OK:
/* Transfer is complete */
return (I2C_EVENT_TRANSFER_COMPLETE & event_mask);

case STATUS_ERR_BAD_ADDRESS:
/* Received a NACK */
return (I2C_EVENT_ERROR_NO_SLAVE & event_mask);

case STATUS_ERR_PACKET_COLLISION:
/* An error occurred in between transfer */
return (I2C_EVENT_ERROR & event_mask);

default:
return 0;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ static inline void reset_usart(serial_t *obj)

/* Reset module */
_USART(obj).CTRLA.reg = SERCOM_USART_CTRLA_SWRST;
SUPPRESS_WARNING(reset_usart);
SUPPRESS_WARNING(reset_usart);
}

uint32_t serial_find_mux_settings (serial_t *obj)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -863,7 +863,7 @@ static enum status_code _spi_transceive_buffer(spi_t *obj)
void spi_master_transfer(spi_t *obj, const void *tx, size_t tx_length, void *rx, size_t rx_length, uint8_t bit_width, uint32_t handler, uint32_t event, DMAUsage hint)
{
uint16_t dummy_read;
(void) dummy_read;
(void) dummy_read;
/* Sanity check arguments */
MBED_ASSERT(obj);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ void us_ticker_init(void)

/* Initialize the timer */
tc_init(&us_ticker_module, TICKER_COUNTER_uS, &config_tc);
MBED_ASSERT(ret_status == STATUS_OK);

/* Register callback function */
tc_register_callback(&us_ticker_module, (tc_callback_t)us_ticker_irq_handler_internal, TC_CALLBACK_CC_CHANNEL0);
Expand Down