Skip to content

Commit

Permalink
Merge pull request steve-m#19 from ddcc/master
Browse files Browse the repository at this point in the history
Fix misc. compilation issues, update gitignore
  • Loading branch information
racerxdl authored Sep 17, 2016
2 parents 35bf7ad + e35935f commit 609e87b
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions src/librtlsdr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -2435,4 +2435,4 @@ int rtlsdr_ir_query(rtlsdr_dev_t *d, uint8_t *buf, size_t buf_len)
err:
printf("failed=%d\n", ret);
return ret;
}
}
4 changes: 2 additions & 2 deletions src/rtl_adsb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/rtl_ir.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion src/rtl_power.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 609e87b

Please sign in to comment.