Port serial to new memory format
This commit is contained in:
1 parent
77195fb1d0
commit
256ff916a2
16 files changed
+218
-240
No files matched your search
+6
-5
@@ -1308,8 +1308,8 @@ M_IF_METHOD(OUT_STR, oplist)( extern void M_F(name, _out_str)(FILE *, const shar
|
||||
M_IF_METHOD(IN_STR, oplist)( extern bool M_F(name, _in_str)(shared_t *, FILE *); , ) \
|
||||
M_IF_METHOD(GET_STR, oplist)( extern void M_F(name, _get_str)(m_string_t, const shared_t *, bool); , ) \
|
||||
M_IF_METHOD(PARSE_STR, oplist)( extern bool M_F(name, _parse_str)(shared_t *, const char *, const char **); , ) \
|
||||
M_IF_METHOD(OUT_SERIAL, oplist)( extern m_serial_return_code_t M_F(name, _out_serial)(m_serial_write_t, const shared_t *); , ) \
|
||||
M_IF_METHOD(IN_SERIAL, oplist)( extern m_serial_return_code_t M_F(name, _in_serial)(shared_t *, m_serial_read_t); , ) \
|
||||
M_IF_METHOD(OUT_SERIAL, oplist)( extern m_serial_return_code_t M_F(M_P_EXPAND name, _out_serial)(m_serial_write_t, const shared_t *); , ) \
|
||||
M_IF_METHOD(IN_SERIAL, oplist)( extern m_serial_return_code_t M_F(M_P_EXPAND name, _in_serial)(shared_t *, m_serial_read_t); , ) \
|
||||
|
||||
#define M_SHAR3D_PTR_DEF_IO(name, shared_t, type, oplist, fattr) \
|
||||
M_IF_METHOD(OUT_STR, oplist)( \
|
||||
@@ -1364,12 +1364,13 @@ M_IF_METHOD(PARSE_STR, oplist)( \
|
||||
} \
|
||||
, ) \
|
||||
M_IF_METHOD(OUT_SERIAL, oplist)( \
|
||||
fattr m_serial_return_code_t M_F(name, _out_serial)(m_serial_write_t serial, const shared_t *out) \
|
||||
fattr m_serial_return_code_t M_F(name, _out_serial)(M_P_EXPAND m_serial_write_t serial, const shared_t *out) \
|
||||
{ \
|
||||
M_ASSERT (out != NULL); \
|
||||
M_F(name, _read_lock)(out); \
|
||||
/* FIXME: No exception. Really? */ \
|
||||
m_serial_return_code_t r = M_CALL_OUT_SERIAL(oplist, serial, out->data); \
|
||||
m_volatile m_serial_return_code_t r = M_SERIAL_FAIL; \
|
||||
M_ON_EXCEPTION( M_F(name, _read_unlock)(out) ) \
|
||||
r = M_CALL_OUT_SERIAL(oplist, serial, out->data); \
|
||||
M_F(name, _read_unlock)(out); \
|
||||
return r; \
|
||||
} \
|
||||
|
||||
Reference in new issue
Block a user