X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fnet%2Fax25.h;h=0e609136f18e5d56f20b066f39b6ea23eacaa731;hb=391b4f8d9c82c413f2cd11fb3ba3aeb311f62184;hp=5daabd5b4b9481cfe2ad382f8e6302dfe16c3593;hpb=63a35af8aab90ed049447a2837666a52f13b9598;p=bertos.git

diff --git a/bertos/net/ax25.h b/bertos/net/ax25.h
index 5daabd5b..0e609136 100644
--- a/bertos/net/ax25.h
+++ b/bertos/net/ax25.h
@@ -96,11 +96,11 @@ typedef struct AX25Call
 } AX25Call;
 
 /**
- * Create an AX25Call structure on the fly and return its pointer.
+ * Create an AX25Call structure on the fly.
  * \param str callsign, can be 6 characters or shorter.
  * \param id  ssid associated with the callsign.
  */
-#define AX25_CALL(str, id) ({ static const AX25Call _call = { .call = (str), .ssid = (id) }; &_call; })
+#define AX25_CALL(str, id) {.call = (str), .ssid = (id) }
 
 /**
  * Maximum number of Repeaters in a AX25 message.
@@ -142,16 +142,27 @@ typedef struct AX25Msg
 
 
 /**
- * Check if there are any AX25 messages to be processed.
- * This function read available characters from the medium and search for
- * any AX25 messages.
- * If a message is found it is decoded and the linked callback executed.
- * This function may be blocking if there are no available chars and the KFile
- * used in \a ctx to access the medium is configured in blocking mode.
+ * Declare an AX25 path.
+ * \param dst the destination callsign for the path, \see AX25_CALL
+ *        for a handy way to create a callsign on the fly.
+ * \param src the source callsign for the path, \see AX25_CALL
+ *        for a handy way to create a callsign on the fly.
  *
- * \param ctx AX25 context to operate on.
+ * Additional optional callsigns can be specified at the end of this macro
+ * in order to add repeater callsigns or specific unproto paths.
+ *
+ * This macro can be used to simply path array declaration.
+ * Should be used in this way:
+ * \code
+ * AX25Call path[] = AX25_PATH(AX25_CALL("abcdef", 0), AX25_CALL("ghjklm", 0), AX25_CALL("wide1", 1), AX25_CALL("wide2", 2));
+ * \endcode
+ *
+ * The declared path can then be passed to ax25_sendVia().
  */
+#define AX25_PATH(dst, src, ...) { dst, src, ## __VA_ARGS__ }
+
 void ax25_poll(AX25Ctx *ctx);
+void ax25_sendVia(AX25Ctx *ctx, const AX25Call *path, size_t path_len, const void *_buf, size_t len);
 
 /**
  * Send an AX25 frame on the channel.
@@ -160,21 +171,16 @@ void ax25_poll(AX25Ctx *ctx);
  *        for a handy way to create a callsign on the fly.
  * \param src the source callsign for the frame, \see AX25_CALL
  *        for a handy way to create a callsign on the fly.
- * \param _buf payload buffer.
+ * \param buf payload buffer.
  * \param len length of the payload.
- */
-void ax25_send(AX25Ctx *ctx, const AX25Call *dst, const AX25Call *src, const void *_buf, size_t len);
-
-
-/**
- * Init the AX25 protocol decoder.
  *
- * \param ctx AX25 context to init.
- * \param channel Used to gain access to the physical medium
- * \param hook Callback function called when a message is received
+ * \see ax25_sendVia() if you want to send a frame with a specific path.
  */
+#define ax25_send(ctx, dst, src, buf, len) ax25_sendVia(ctx, ({static AX25Call __path[]={dst, src}; __path;}), 2, buf, len)
 void ax25_init(AX25Ctx *ctx, KFile *channel, ax25_callback_t hook);
 
+void ax25_print(KFile *ch, const AX25Msg *msg);
+
 int ax25_testSetup(void);
 int ax25_testTearDown(void);
 int ax25_testRun(void);