Fix misc. compilation issues, update gitignore

master
Dominic Chen 2016-09-16 18:30:09 -04:00
parent 35bf7adf75
commit e35935f443
5 changed files with 8 additions and 6 deletions

2
.gitignore vendored
View File

@ -47,7 +47,9 @@ build
src/rtl_adsb
src/rtl_eeprom
src/rtl_fm
src/rtl_ir
src/rtl_power
src/rtl_rpcd
src/rtl_test
debianize/*.deb

View File

@ -2377,7 +2377,7 @@ int rtlsdr_ir_query(rtlsdr_dev_t *d, uint8_t *buf, size_t buf_len)
ret = rtlsdr_write_reg_mask(d, init_tab[i].block, init_tab[i].reg,
init_tab[i].val, init_tab[i].mask);
if (ret < 0) {
fprintf(stderr, "write %d reg %d %.4x %.2x %.2x failed\n", i, init_tab[i].block,
fprintf(stderr, "write %zd reg %d %.4x %.2x %.2x failed\n", i, init_tab[i].block,
init_tab[i].reg, init_tab[i].val, init_tab[i].mask);
goto err;
}
@ -2435,4 +2435,4 @@ exit:
err:
printf("failed=%d\n", ret);
return ret;
}
}

View File

@ -185,7 +185,7 @@ int magnitute(uint8_t *buf, int len)
return len/2;
}
inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d)
static inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d)
/* takes 4 consecutive real samples, return 0 or 1, BADSAMPLE on error */
{
int bit, bit_p;
@ -236,7 +236,7 @@ inline uint16_t max16(uint16_t a, uint16_t b)
return a>b ? a : b;
}
inline int preamble(uint16_t *buf, int i)
static inline int preamble(uint16_t *buf, int i)
/* returns 0/1 for preamble at index i */
{
int i2;

View File

@ -77,7 +77,7 @@ void usage(void)
"\t[-b]\tDisplay output in binary (default), pulse=1, space=0; each 20 usec\n"
"\t[-t]\tDisplay output in text format\n"
"\t[-x]\tDisplay output in raw packed bytes, MSB=pulse/space, 7LSB=duration*20 usec\n"
"\t[-h]\tHelp\n"
"\t[-h]\tHelp\n"
);
exit(1);
}

View File

@ -252,7 +252,7 @@ void sine_table(int size)
}
}
inline int16_t FIX_MPY(int16_t a, int16_t b)
static inline int16_t FIX_MPY(int16_t a, int16_t b)
/* fixed point multiply and scale */
{
int c = ((int)a * (int)b) >> 14;