deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove compiler warnings

Browse source
This commit is contained in:
dak664 2009-07-23 16:10:42 +00:00
parent 34a6fc82a3
commit 7af93463b5
6 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cpu/avr/dev/usb/rndis/rndis.c
View file

@ -166,7 +166,7 @@ rndis_stat_t rndis_stat;
uint8_t schedule_interrupt = 0; uint8_t schedule_interrupt = 0;
uint64_t rndis_ethernet_addr = 0x203478928323UL; uint64_t rndis_ethernet_addr = 0x203478928323ULL;
//_____ D E C L A R A T I O N ______________________________________________ //_____ D E C L A R A T I O N ______________________________________________

3
cpu/avr/dev/usb/rndis/rndis_task.c
View file

@ -95,7 +95,6 @@ char usb_busy = 0;
static struct etimer et; static struct etimer et;
static struct timer flood_timer; static struct timer flood_timer;
static uint16_t iad_fail_timeout, rndis_fail_timeout;
static uint8_t doInit = 1; static uint8_t doInit = 1;
@ -130,6 +129,7 @@ PROCESS_THREAD(rndis_process, ev, data_proc)
have a system that does not support IAD (winXP). If so have a system that does not support IAD (winXP). If so
count the timeout then switch to just network interface. */ count the timeout then switch to just network interface. */
#if 0 #if 0
static uint16_t iad_fail_timeout, rndis_fail_timeout;
if (usb_mode == rndis_debug) { if (usb_mode == rndis_debug) {
//If we have timed out, detach //If we have timed out, detach
if (iad_fail_timeout == IAD_TIMEOUT_DETACH) { if (iad_fail_timeout == IAD_TIMEOUT_DETACH) {
@ -232,6 +232,7 @@ PROCESS_THREAD(rndis_process, ev, data_proc)
//Wait until timer expiers //Wait until timer expiers
usb_busy = 1; usb_busy = 1;
etimer_set(&et, flood_timer.interval - timediff); etimer_set(&et, flood_timer.interval - timediff);
//Try commenting out the next line if Jackdaw stops RF transmission in Windows after a 5 minute idle period - dak
PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et)); PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
//Reselect endpoint in case we lost it //Reselect endpoint in case we lost it

5
cpu/avr/dev/usb/serial/cdc_task.c
View file

@ -57,6 +57,7 @@
#include "sicslow_ethernet.h" #include "sicslow_ethernet.h"
#include "radio.h" #include "radio.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <avr/pgmspace.h> #include <avr/pgmspace.h>
#include <avr/eeprom.h> #include <avr/eeprom.h>
@ -222,8 +223,8 @@ void menu_process(char c)
//If valid input, change it //If valid input, change it
if (tempchannel) { if (tempchannel) {
radio_set_operating_channel(tempchannel); radio_set_operating_channel(tempchannel);
eeprom_write_byte(9, tempchannel); //Write channel eeprom_write_byte((uint8_t *) 9, tempchannel); //Write channel
eeprom_write_byte(10, ~tempchannel); //Bit inverse as check eeprom_write_byte((uint8_t *)10, ~tempchannel); //Bit inverse as check
} }
menustate = normal; menustate = normal;

1
cpu/avr/dev/usb/serial/uart_usb_lib.h
View file

@ -77,6 +77,7 @@ int uart_usb_putchar(int);
void uart_usb_flush(void); void uart_usb_flush(void);
bit uart_usb_test_hit(void); bit uart_usb_test_hit(void);
char uart_usb_getchar(void); char uart_usb_getchar(void);
void uart_usb_set_stdout(void);
/** @} **/ /** @} **/

6
cpu/avr/dev/usb/storage/avr_flash.h
View file

@ -125,8 +125,10 @@ Ctrl_status avrf_write_10( U32 addr , U16 nb_sector );
#else #else
#include "usb_drv.h" // In this case the driver must be known for the USB access #include "usb_drv.h" // In this case the driver must be known for the USB access
#endif #endif
Ctrl_status avr_usb_read( void ); //Ctrl_status avr_usb_read( void );
Ctrl_status avr_usb_write( void ); //Ctrl_status avr_usb_write( void );
Ctrl_status avrf_usb_read( void );
Ctrl_status avrf_usb_write( void );

7
cpu/avr/dev/usb/storage/ctrl_access.c
View file

@ -57,6 +57,7 @@
#include "config.h" #include "config.h"
#include "storage/ctrl_access.h" #include "storage/ctrl_access.h"
#include "avr_flash.h"
//_____ D E F I N I T I O N S ______________________________________________ //_____ D E F I N I T I O N S ______________________________________________
@ -465,6 +466,7 @@ Bool mem_removal( U8 lun )
//! //!
//! @return pointer to code string //! @return pointer to code string
//! //!
#if 0 //not used anywhere and the FLASH attribute causes a compilation warning - dak
U8 FLASH* mem_name( U8 lun ) U8 FLASH* mem_name( U8 lun )
{ {
switch( lun ) switch( lun )
@ -517,6 +519,7 @@ U8 FLASH* mem_name( U8 lun )
} }
return 0; // Remove compiler warning return 0; // Remove compiler warning
} }
#endif /* 0 */
//************************************************************************************ //************************************************************************************
//!----------- Listing of READ/WRITE interface with MODE ACCESS REGISTER ------------- //!----------- Listing of READ/WRITE interface with MODE ACCESS REGISTER -------------
@ -536,7 +539,7 @@ U8 FLASH* mem_name( U8 lun )
//! //!
Ctrl_status memory_2_usb( U8 lun , U32 addr , U16 nb_sector ) Ctrl_status memory_2_usb( U8 lun , U32 addr , U16 nb_sector )
{ {
Ctrl_status status; Ctrl_status status=0;
switch( lun ) switch( lun )
{ {
@ -629,7 +632,7 @@ Ctrl_status memory_2_usb( U8 lun , U32 addr , U16 nb_sector )
//! //!
Ctrl_status usb_2_memory( U8 lun , U32 addr , U16 nb_sector ) Ctrl_status usb_2_memory( U8 lun , U32 addr , U16 nb_sector )
{ {
Ctrl_status status; Ctrl_status status=0;
switch( lun ) switch( lun )
{ {