Skip to content
This repository was archived by the owner on Jan 27, 2021. It is now read-only.

Commit 609e87b

Browse files
authored
Merge pull request keenerd#19 from ddcc/master
Fix misc. compilation issues, update gitignore
2 parents 35bf7ad + e35935f commit 609e87b

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ build
4747
src/rtl_adsb
4848
src/rtl_eeprom
4949
src/rtl_fm
50+
src/rtl_ir
5051
src/rtl_power
52+
src/rtl_rpcd
5153
src/rtl_test
5254

5355
debianize/*.deb

src/librtlsdr.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2377,7 +2377,7 @@ int rtlsdr_ir_query(rtlsdr_dev_t *d, uint8_t *buf, size_t buf_len)
23772377
ret = rtlsdr_write_reg_mask(d, init_tab[i].block, init_tab[i].reg,
23782378
init_tab[i].val, init_tab[i].mask);
23792379
if (ret < 0) {
2380-
fprintf(stderr, "write %d reg %d %.4x %.2x %.2x failed\n", i, init_tab[i].block,
2380+
fprintf(stderr, "write %zd reg %d %.4x %.2x %.2x failed\n", i, init_tab[i].block,
23812381
init_tab[i].reg, init_tab[i].val, init_tab[i].mask);
23822382
goto err;
23832383
}
@@ -2435,4 +2435,4 @@ int rtlsdr_ir_query(rtlsdr_dev_t *d, uint8_t *buf, size_t buf_len)
24352435
err:
24362436
printf("failed=%d\n", ret);
24372437
return ret;
2438-
}
2438+
}

src/rtl_adsb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ int magnitute(uint8_t *buf, int len)
185185
return len/2;
186186
}
187187

188-
inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d)
188+
static inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d)
189189
/* takes 4 consecutive real samples, return 0 or 1, BADSAMPLE on error */
190190
{
191191
int bit, bit_p;
@@ -236,7 +236,7 @@ inline uint16_t max16(uint16_t a, uint16_t b)
236236
return a>b ? a : b;
237237
}
238238

239-
inline int preamble(uint16_t *buf, int i)
239+
static inline int preamble(uint16_t *buf, int i)
240240
/* returns 0/1 for preamble at index i */
241241
{
242242
int i2;

src/rtl_ir.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ void usage(void)
7777
"\t[-b]\tDisplay output in binary (default), pulse=1, space=0; each 20 usec\n"
7878
"\t[-t]\tDisplay output in text format\n"
7979
"\t[-x]\tDisplay output in raw packed bytes, MSB=pulse/space, 7LSB=duration*20 usec\n"
80-
"\t[-h]\tHelp\n"
80+
"\t[-h]\tHelp\n"
8181
);
8282
exit(1);
8383
}

src/rtl_power.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ void sine_table(int size)
252252
}
253253
}
254254

255-
inline int16_t FIX_MPY(int16_t a, int16_t b)
255+
static inline int16_t FIX_MPY(int16_t a, int16_t b)
256256
/* fixed point multiply and scale */
257257
{
258258
int c = ((int)a * (int)b) >> 14;

0 commit comments

Comments
 (0)