From 613eb25545e26e12c77af7154feb0ad039d86429 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Wed, 15 Jan 2014 23:02:53 +0000
Subject: [PATCH] stm: Fix print methods with new kind argument.

---
 py/obj.h    | 1 -
 stm/adc.c   | 2 +-
 stm/i2c.c   | 2 +-
 stm/led.c   | 2 +-
 stm/servo.c | 2 +-
 stm/usart.c | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/py/obj.h b/py/obj.h
index cbd12fe862..99d430f490 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -243,7 +243,6 @@ bool mp_obj_equal(mp_obj_t o1, mp_obj_t o2);
 bool mp_obj_less(mp_obj_t o1, mp_obj_t o2);
 
 machine_int_t mp_obj_get_int(mp_obj_t arg);
-machine_int_t mp_obj_parse_int(mp_obj_t arg, mp_obj_t base_arg);
 #if MICROPY_ENABLE_FLOAT
 mp_float_t mp_obj_get_float(mp_obj_t self_in);
 void mp_obj_get_complex(mp_obj_t self_in, mp_float_t *real, mp_float_t *imag);
diff --git a/stm/adc.c b/stm/adc.c
index 1f666c2718..2a50abee28 100644
--- a/stm/adc.c
+++ b/stm/adc.c
@@ -267,7 +267,7 @@ static mp_obj_t adc_obj_read_core_vref(mp_obj_t self_in) {
     return ret;
 }
 
-static void adc_obj_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in) {
+static void adc_obj_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_adc_obj_t *self = self_in;
     print(env, "<ADC %lu>", self->adc_id);
 }
diff --git a/stm/i2c.c b/stm/i2c.c
index 22c908566d..d4e4f18b0d 100644
--- a/stm/i2c.c
+++ b/stm/i2c.c
@@ -252,7 +252,7 @@ typedef struct _pyb_i2c_obj_t {
     i2c_state_t i2c_state;
 } pyb_i2c_obj_t;
 
-void i2c_obj_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in) {
+void i2c_obj_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_i2c_obj_t *self = self_in;
     print(env, "<I2C%lu addr:%lu>", (unsigned int)self->i2c_port, (unsigned int)self->i2c_addr);
 }
diff --git a/stm/led.c b/stm/led.c
index eb7c76ef1f..8248a5c7d5 100644
--- a/stm/led.c
+++ b/stm/led.c
@@ -156,7 +156,7 @@ typedef struct _pyb_led_obj_t {
     uint led_id;
 } pyb_led_obj_t;
 
-void led_obj_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in) {
+void led_obj_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_led_obj_t *self = self_in;
     print(env, "<LED %lu>", self->led_id);
 }
diff --git a/stm/servo.c b/stm/servo.c
index cc9633a996..f89c97f1c5 100644
--- a/stm/servo.c
+++ b/stm/servo.c
@@ -116,7 +116,7 @@ typedef struct _pyb_servo_obj_t {
     uint servo_id;
 } pyb_servo_obj_t;
 
-static void servo_obj_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in) {
+static void servo_obj_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_servo_obj_t *self = self_in;
     print(env, "<Servo %lu>", self->servo_id);
 }
diff --git a/stm/usart.c b/stm/usart.c
index 5f47ec788a..796516f547 100644
--- a/stm/usart.c
+++ b/stm/usart.c
@@ -207,7 +207,7 @@ static mp_obj_t usart_obj_tx_str(mp_obj_t self_in, mp_obj_t s) {
     return mp_const_none;
 }
 
-static void usart_obj_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in) {
+static void usart_obj_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_usart_obj_t *self = self_in;
     print(env, "<Usart %lu>", self->usart_id);
 }