Diff: can_api.h

Revision:

21:bcd8161f8f6c

Parent:

16:f4c8f45bded9

diff -r 249e3f065956 -r bcd8161f8f6c can_api.h
--- a/can_api.h	Sat Mar 19 21:16:10 2016 +0000
+++ b/can_api.h	Thu May 19 17:16:59 2016 +0000
@@ -71,31 +71,20 @@
 
 typedef void (*can_irq_handler)(uint32_t id, CanIrqType type);
 
-struct can_s {
-    CAN_TypeDef *dev;
-    int index;
-};
-
-typedef struct can_s can_t;
-
-void          can_init     (can_t *obj, PinName rd, PinName td, FunctionalState abom);
-void          can_free     (can_t *obj);
-int           can_frequency(can_t *obj, int hz);
-
-void          can_irq_init (can_t *obj, can_irq_handler handler, uint32_t id);
-void          can_irq_free (can_t *obj);
-//void          can_irq_set  (can_t *obj, CanIrqType irq, uint32_t enable);
-void          can_irq_set(void (*fptr)(void));
-
-
-int           can_write    (can_t *obj, CAN_Message, int cc);
-int           can_read     (can_t *obj, CAN_Message *msg, int handle);
-int           can_mode     (can_t *obj, CanMode mode);
-int           can_filter   (can_t *obj, uint32_t id, uint32_t mask, CANFormat format, int32_t handle);
-void          can_reset    (can_t *obj);
-unsigned char can_rderror  (can_t *obj);
-unsigned char can_tderror  (can_t *obj);
-void          can_monitor  (can_t *obj, int silent);
+void          can_init     (PinName rd, PinName td, FunctionalState abom);
+void          can_free     (void);
+int           can_frequency(int hz);
+void          can_irq_init (uint32_t id, can_irq_handler handler);
+void          can_irq_free (void);
+int           can_write    (CAN_Message, int cc);
+int           can_read     (CAN_Message *msg, int handle);
+int           can_mode     (CanMode mode);
+int           can_filter   (uint32_t id, uint32_t mask, CANFormat format, int32_t handle);
+void          can_reset    (void);
+unsigned char can_rderror  (void);
+unsigned char can_tderror  (void);
+void          can_monitor  (int silent);
+void          can_callback (void);
 
 #ifdef __cplusplus
 };