From 2d19a2bf74e735a48ef3020835bb04fcea9d8840 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Tue, 3 Mar 2015 23:57:48 +0100
Subject: use printf_P(PSTR(__fmt__...  where possible

---
 lib/cc1101.c  | 15 ++++++++-------
 lib/rda1846.c |  9 +++++----
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'lib')

diff --git a/lib/cc1101.c b/lib/cc1101.c
index 3831af5..babc9d1 100644
--- a/lib/cc1101.c
+++ b/lib/cc1101.c
@@ -21,6 +21,7 @@
  */
 
 #include <stdio.h>
+#include <avr/pgmspace.h>
 
 #include "cc1101.h"
 #include "cc1101_defines.h"
@@ -946,22 +947,22 @@ static char* cc1101_status_reg_to_string(uint8_t addr)
 
 void cc1101_dump_register(void)
 {
-  printf("CC1101: register dump\r\n\r\n");
+  printf_P(PSTR("CC1101: register dump\r\n\r\n"));
 
   int i;
 
-  printf(" config (read/write) register:\r\n");
+  printf_P(PSTR(" config (read/write) register:\r\n"));
   uint8_t data[(CC1101_REG_RW_MAX-CC1101_REG_RW_MIN) + 1];
   uint8_t l = cc1101_spi_read_register_burst(CC1101_REG_RW_MIN, data, sizeof(data));
   for(i=0; i<l; ++i) {
-    printf("  0x%02X (%s): 0x%02X\r\n", i, cc1101_config_reg_to_string(i), data[i]);
+    printf_P(PSTR("  0x%02X (%s): 0x%02X\r\n"), i, cc1101_config_reg_to_string(i), data[i]);
   }
-  printf("\r\n");
+  printf_P(PSTR("\r\n"));
 
-  printf(" status (read-only) register:\r\n");
+  printf_P(PSTR(" status (read-only) register:\r\n"));
   for(i=CC1101_REG_RO_MIN; i<=CC1101_REG_RO_MAX; ++i) {
     uint8_t data = cc1101_spi_read_register(i);
-    printf("  0x%02X (%s): 0x%02X\r\n", i, cc1101_status_reg_to_string(i), data);
+    printf_P(PSTR("  0x%02X (%s): 0x%02X\r\n"), i, cc1101_status_reg_to_string(i), data);
   }
-  printf("\r\n");
+  printf_P(PSTR("\r\n"));
 }
diff --git a/lib/rda1846.c b/lib/rda1846.c
index 83cc270..1f69ad7 100644
--- a/lib/rda1846.c
+++ b/lib/rda1846.c
@@ -22,6 +22,7 @@
 
 #include "LUFA/Drivers/Peripheral/TWI.h"
 #include <stdio.h>
+#include <avr/pgmspace.h>
 
 #include "rda1846.h"
 #include "rda1846_defines.h"
@@ -43,7 +44,7 @@ static uint8_t rda1846_write_register_raw(const uint8_t addr, const uint16_t dat
 
 i2c_error:
   TWI_StopTransmission();
-  printf("I2C error (write_register_raw)\r\n");
+  printf_P(PSTR("I2C error (write_register_raw)\r\n"));
   return 1;
 }
 
@@ -69,7 +70,7 @@ static uint8_t rda1846_read_register_raw(const uint8_t addr, uint16_t* data)
 
 i2c_error:
   TWI_StopTransmission();
-  printf("I2C error (read_register_raw)\r\n");
+  printf_P(PSTR("I2C error (read_register_raw)\r\n"));
   return 1;
 }
 
@@ -465,7 +466,7 @@ static char* rda1846_regaddr_to_string(uint8_t addr)
 
 void rda1846_dump_register(void)
 {
-  printf("RDA1846: register dump\r\n");
+  printf_P(PSTR("RDA1846: register dump\r\n"));
 
   const uint8_t regs[] = { RDA1846_REG_CLK_MODE, RDA1846_REG_XTAL, RDA1846_REG_ADCLK,
                            RDA1846_REG_RF_BAND, RDA1846_REG_FREQH, RDA1846_REG_FREQL,
@@ -480,6 +481,6 @@ void rda1846_dump_register(void)
     uint16_t data;
     if(rda1846_read_register(regs[i], &data))
       data = 0xFFFF;
-    printf(" 0x%02X (%s): 0x%04X\r\n", regs[i], rda1846_regaddr_to_string(regs[i]), data);
+    printf_P(PSTR(" 0x%02X (%s): 0x%04X\r\n"), regs[i], rda1846_regaddr_to_string(regs[i]), data);
   }
 }
-- 
cgit v1.2.3