aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2022-12-18 10:44:46 +0900
committer坂本 貴史 <o-takashi@sakamocchi.jp>2022-12-18 15:38:44 +0900
commitbf0c3608c9254e6abf0a0b56625e37927d6f3204 (patch)
tree336313a3064d4de09fd621d1077c8d56a0b96216
parent0c0f8d87944f4f8f4f6f0a3ab34f9c1532626344 (diff)
downloadlibhinoko-bf0c3608c9254e6abf0a0b56625e37927d6f3204.tar.gz
fw_iso_it: rename to HinokoFwIsoIt
In teminology of device driver development, the choice of word is device-oriented, thus 'rx' is for incoming data path to target device, and 'tx' is for outgoing data path from target device. Current implementation uses the words for different ways. This commit corrects the usage of words with loss of backward compatibility. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
-rwxr-xr-xsamples/iso-it (renamed from samples/iso-tx)4
-rw-r--r--src/fw_iso_it.c (renamed from src/fw_iso_tx.c)206
-rw-r--r--src/fw_iso_it.h (renamed from src/fw_iso_tx.h)28
-rw-r--r--src/hinoko.h2
-rw-r--r--src/hinoko.map15
-rw-r--r--src/meson.build4
-rwxr-xr-xtests/fw-iso-it (renamed from tests/fw-iso-tx)2
-rw-r--r--tests/meson.build2
8 files changed, 131 insertions, 132 deletions
diff --git a/samples/iso-tx b/samples/iso-it
index d8f2458..9b1c09f 100755
--- a/samples/iso-tx
+++ b/samples/iso-it
@@ -9,7 +9,7 @@ from gi.repository import GLib
gi.require_version('Hinoko', '0.0')
from gi.repository import Hinoko
-class IsoTx(Hinoko.FwIsoTx):
+class IsoIt(Hinoko.FwIsoIt):
def new(self, path, channel, maximum_bytes_per_payload, packets_per_buffer):
# Use 8 byte header for CIP header.
cip_header_size = 8
@@ -115,7 +115,7 @@ packets_per_buffer = 32
packets_per_interrupt = 4
duration = 4
-ctx = IsoTx()
+ctx = IsoIt()
ctx.new('/dev/fw0', channel, maximum_bytes_per_payload, packets_per_buffer)
dispatcher = GLib.MainLoop.new(None, False)
diff --git a/src/fw_iso_tx.c b/src/fw_iso_it.c
index 8d082f6..4553cee 100644
--- a/src/fw_iso_tx.c
+++ b/src/fw_iso_it.c
@@ -2,57 +2,57 @@
#include "fw_iso_ctx_private.h"
/**
- * HinokoFwIsoTx:
+ * HinokoFwIsoIt:
* An object to transmit isochronous packet for single channel.
*
- * A [class@FwIsoTx] transmits isochronous packets for single channel by IT context in 1394 OHCI.
+ * A [class@FwIsoIt] transmits isochronous packets for single channel by IT context in 1394 OHCI.
* The content of packet is split to two parts; context header and context payload in a manner of
* Linux FireWire subsystem.
*/
typedef struct {
struct fw_iso_ctx_state state;
guint offset;
-} HinokoFwIsoTxPrivate;
+} HinokoFwIsoItPrivate;
static void fw_iso_ctx_iface_init(HinokoFwIsoCtxInterface *iface);
-G_DEFINE_TYPE_WITH_CODE(HinokoFwIsoTx, hinoko_fw_iso_tx, G_TYPE_OBJECT,
- G_ADD_PRIVATE(HinokoFwIsoTx)
+G_DEFINE_TYPE_WITH_CODE(HinokoFwIsoIt, hinoko_fw_iso_it, G_TYPE_OBJECT,
+ G_ADD_PRIVATE(HinokoFwIsoIt)
G_IMPLEMENT_INTERFACE(HINOKO_TYPE_FW_ISO_CTX, fw_iso_ctx_iface_init))
-enum fw_iso_tx_sig_type {
- FW_ISO_TX_SIG_TYPE_IRQ = 1,
- FW_ISO_TX_SIG_TYPE_COUNT,
+enum fw_iso_it_sig_type {
+ FW_ISO_IT_SIG_TYPE_IRQ = 1,
+ FW_ISO_IT_SIG_TYPE_COUNT,
};
-static guint fw_iso_tx_sigs[FW_ISO_TX_SIG_TYPE_COUNT] = { 0 };
+static guint fw_iso_it_sigs[FW_ISO_IT_SIG_TYPE_COUNT] = { 0 };
-static void fw_iso_tx_get_property(GObject *obj, guint id, GValue *val, GParamSpec *spec)
+static void fw_iso_it_get_property(GObject *obj, guint id, GValue *val, GParamSpec *spec)
{
- HinokoFwIsoTx *self = HINOKO_FW_ISO_TX(obj);
- HinokoFwIsoTxPrivate *priv = hinoko_fw_iso_tx_get_instance_private(self);
+ HinokoFwIsoIt *self = HINOKO_FW_ISO_IT(obj);
+ HinokoFwIsoItPrivate *priv = hinoko_fw_iso_it_get_instance_private(self);
fw_iso_ctx_state_get_property(&priv->state, obj, id, val, spec);
}
-static void fw_iso_tx_finalize(GObject *obj)
+static void fw_iso_it_finalize(GObject *obj)
{
hinoko_fw_iso_ctx_release(HINOKO_FW_ISO_CTX(obj));
- G_OBJECT_CLASS(hinoko_fw_iso_tx_parent_class)->finalize(obj);
+ G_OBJECT_CLASS(hinoko_fw_iso_it_parent_class)->finalize(obj);
}
-static void hinoko_fw_iso_tx_class_init(HinokoFwIsoTxClass *klass)
+static void hinoko_fw_iso_it_class_init(HinokoFwIsoItClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
- gobject_class->get_property = fw_iso_tx_get_property;
- gobject_class->finalize = fw_iso_tx_finalize;
+ gobject_class->get_property = fw_iso_it_get_property;
+ gobject_class->finalize = fw_iso_it_finalize;
fw_iso_ctx_class_override_properties(gobject_class);
/**
- * HinokoFwIsoTx::interrupted:
- * @self: A [class@FwIsoTx].
+ * HinokoFwIsoIt::interrupted:
+ * @self: A [class@FwIsoIt].
* @sec: sec part of isochronous cycle when interrupt occurs, up to 7.
* @cycle: cycle part of of isochronous cycle when interrupt occurs, up to 7999.
* @tstamp: (array length=tstamp_length) (element-type guint8): A series of timestamps for
@@ -69,11 +69,11 @@ static void hinoko_fw_iso_tx_class_init(HinokoFwIsoTxClass *klass)
* one quarter of memory page size (usually 4,096 / 4 = 1,024 packets).
* - When application calls [method@FwIsoCtx.flush_completions] explicitly.
*/
- fw_iso_tx_sigs[FW_ISO_TX_SIG_TYPE_IRQ] =
+ fw_iso_it_sigs[FW_ISO_IT_SIG_TYPE_IRQ] =
g_signal_new("interrupted",
G_OBJECT_CLASS_TYPE(klass),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(HinokoFwIsoTxClass, interrupted),
+ G_STRUCT_OFFSET(HinokoFwIsoItClass, interrupted),
NULL, NULL,
hinoko_sigs_marshal_VOID__UINT_UINT_POINTER_UINT_UINT,
G_TYPE_NONE,
@@ -81,22 +81,22 @@ static void hinoko_fw_iso_tx_class_init(HinokoFwIsoTxClass *klass)
G_TYPE_UINT, G_TYPE_UINT);
}
-static void hinoko_fw_iso_tx_init(HinokoFwIsoTx *self)
+static void hinoko_fw_iso_it_init(HinokoFwIsoIt *self)
{
- HinokoFwIsoTxPrivate *priv = hinoko_fw_iso_tx_get_instance_private(self);
+ HinokoFwIsoItPrivate *priv = hinoko_fw_iso_it_get_instance_private(self);
fw_iso_ctx_state_init(&priv->state);
}
-static void fw_iso_tx_stop(HinokoFwIsoCtx *inst)
+static void fw_iso_it_stop(HinokoFwIsoCtx *inst)
{
- HinokoFwIsoTx *self;
- HinokoFwIsoTxPrivate *priv;
+ HinokoFwIsoIt *self;
+ HinokoFwIsoItPrivate *priv;
gboolean running;
- g_return_if_fail(HINOKO_IS_FW_ISO_TX(inst));
- self = HINOKO_FW_ISO_TX(inst);
- priv = hinoko_fw_iso_tx_get_instance_private(self);
+ g_return_if_fail(HINOKO_IS_FW_ISO_IT(inst));
+ self = HINOKO_FW_ISO_IT(inst);
+ priv = hinoko_fw_iso_it_get_instance_private(self);
running = priv->state.running;
@@ -106,72 +106,72 @@ static void fw_iso_tx_stop(HinokoFwIsoCtx *inst)
g_signal_emit_by_name(G_OBJECT(inst), STOPPED_SIGNAL_NAME, NULL);
}
-void fw_iso_tx_unmap_buffer(HinokoFwIsoCtx *inst)
+void fw_iso_it_unmap_buffer(HinokoFwIsoCtx *inst)
{
- HinokoFwIsoTx *self;
- HinokoFwIsoTxPrivate *priv;
+ HinokoFwIsoIt *self;
+ HinokoFwIsoItPrivate *priv;
- g_return_if_fail(HINOKO_IS_FW_ISO_TX(inst));
- self = HINOKO_FW_ISO_TX(inst);
- priv = hinoko_fw_iso_tx_get_instance_private(self);
+ g_return_if_fail(HINOKO_IS_FW_ISO_IT(inst));
+ self = HINOKO_FW_ISO_IT(inst);
+ priv = hinoko_fw_iso_it_get_instance_private(self);
fw_iso_ctx_state_unmap_buffer(&priv->state);
}
-static void fw_iso_tx_release(HinokoFwIsoCtx *inst)
+static void fw_iso_it_release(HinokoFwIsoCtx *inst)
{
- HinokoFwIsoTx *self;
- HinokoFwIsoTxPrivate *priv;
+ HinokoFwIsoIt *self;
+ HinokoFwIsoItPrivate *priv;
- g_return_if_fail(HINOKO_IS_FW_ISO_TX(inst));
- self = HINOKO_FW_ISO_TX(inst);
- priv = hinoko_fw_iso_tx_get_instance_private(self);
+ g_return_if_fail(HINOKO_IS_FW_ISO_IT(inst));
+ self = HINOKO_FW_ISO_IT(inst);
+ priv = hinoko_fw_iso_it_get_instance_private(self);
fw_iso_ctx_state_release(&priv->state);
}
-static gboolean fw_iso_tx_get_cycle_timer(HinokoFwIsoCtx *inst, gint clock_id,
+static gboolean fw_iso_it_get_cycle_timer(HinokoFwIsoCtx *inst, gint clock_id,
HinokoCycleTimer *const *cycle_timer,
GError **error)
{
- HinokoFwIsoTx *self;
- HinokoFwIsoTxPrivate *priv;
+ HinokoFwIsoIt *self;
+ HinokoFwIsoItPrivate *priv;
- g_return_val_if_fail(HINOKO_IS_FW_ISO_TX(inst), FALSE);
- self = HINOKO_FW_ISO_TX(inst);
- priv = hinoko_fw_iso_tx_get_instance_private(self);
+ g_return_val_if_fail(HINOKO_IS_FW_ISO_IT(inst), FALSE);
+ self = HINOKO_FW_ISO_IT(inst);
+ priv = hinoko_fw_iso_it_get_instance_private(self);
return fw_iso_ctx_state_get_cycle_timer(&priv->state, clock_id, cycle_timer, error);
}
-static gboolean fw_iso_tx_flush_completions(HinokoFwIsoCtx *inst, GError **error)
+static gboolean fw_iso_it_flush_completions(HinokoFwIsoCtx *inst, GError **error)
{
- HinokoFwIsoTx *self;
- HinokoFwIsoTxPrivate *priv;
+ HinokoFwIsoIt *self;
+ HinokoFwIsoItPrivate *priv;
- g_return_val_if_fail(HINOKO_IS_FW_ISO_TX(inst), FALSE);
- self = HINOKO_FW_ISO_TX(inst);
- priv = hinoko_fw_iso_tx_get_instance_private(self);
+ g_return_val_if_fail(HINOKO_IS_FW_ISO_IT(inst), FALSE);
+ self = HINOKO_FW_ISO_IT(inst);
+ priv = hinoko_fw_iso_it_get_instance_private(self);
return fw_iso_ctx_state_flush_completions(&priv->state, error);
}
-gboolean fw_iso_tx_handle_event(HinokoFwIsoCtx *inst, const union fw_cdev_event *event,
+gboolean fw_iso_it_handle_event(HinokoFwIsoCtx *inst, const union fw_cdev_event *event,
GError **error)
{
- HinokoFwIsoTx *self;
- HinokoFwIsoTxPrivate *priv;
+ HinokoFwIsoIt *self;
+ HinokoFwIsoItPrivate *priv;
const struct fw_cdev_event_iso_interrupt *ev;
guint sec;
guint cycle;
unsigned int pkt_count;
- g_return_val_if_fail(HINOKO_FW_ISO_TX(inst), FALSE);
+ g_return_val_if_fail(HINOKO_FW_ISO_IT(inst), FALSE);
g_return_val_if_fail(event->common.type == FW_CDEV_EVENT_ISO_INTERRUPT, FALSE);
- self = HINOKO_FW_ISO_TX(inst);
- priv = hinoko_fw_iso_tx_get_instance_private(self);
+ self = HINOKO_FW_ISO_IT(inst);
+ priv = hinoko_fw_iso_it_get_instance_private(self);
ev = &event->iso_interrupt;
@@ -179,50 +179,50 @@ gboolean fw_iso_tx_handle_event(HinokoFwIsoCtx *inst, const union fw_cdev_event
cycle = ohci1394_isoc_desc_tstamp_to_cycle(ev->cycle);
pkt_count = ev->header_length / 4;
- g_signal_emit(inst, fw_iso_tx_sigs[FW_ISO_TX_SIG_TYPE_IRQ], 0, sec, cycle, ev->header,
+ g_signal_emit(inst, fw_iso_it_sigs[FW_ISO_IT_SIG_TYPE_IRQ], 0, sec, cycle, ev->header,
ev->header_length, pkt_count);
return fw_iso_ctx_state_queue_chunks(&priv->state, error);
}
-gboolean fw_iso_tx_create_source(HinokoFwIsoCtx *inst, GSource **source, GError **error)
+gboolean fw_iso_it_create_source(HinokoFwIsoCtx *inst, GSource **source, GError **error)
{
- HinokoFwIsoTx *self;
- HinokoFwIsoTxPrivate *priv;
+ HinokoFwIsoIt *self;
+ HinokoFwIsoItPrivate *priv;
- g_return_val_if_fail(HINOKO_IS_FW_ISO_TX(inst), FALSE);
- self = HINOKO_FW_ISO_TX(inst);
- priv = hinoko_fw_iso_tx_get_instance_private(self);
+ g_return_val_if_fail(HINOKO_IS_FW_ISO_IT(inst), FALSE);
+ self = HINOKO_FW_ISO_IT(inst);
+ priv = hinoko_fw_iso_it_get_instance_private(self);
- return fw_iso_ctx_state_create_source(&priv->state, inst, fw_iso_tx_handle_event, source,
+ return fw_iso_ctx_state_create_source(&priv->state, inst, fw_iso_it_handle_event, source,
error);
}
static void fw_iso_ctx_iface_init(HinokoFwIsoCtxInterface *iface)
{
- iface->stop = fw_iso_tx_stop;
- iface->unmap_buffer = fw_iso_tx_unmap_buffer;
- iface->release = fw_iso_tx_release;
- iface->get_cycle_timer = fw_iso_tx_get_cycle_timer;
- iface->flush_completions = fw_iso_tx_flush_completions;
- iface->create_source = fw_iso_tx_create_source;
+ iface->stop = fw_iso_it_stop;
+ iface->unmap_buffer = fw_iso_it_unmap_buffer;
+ iface->release = fw_iso_it_release;
+ iface->get_cycle_timer = fw_iso_it_get_cycle_timer;
+ iface->flush_completions = fw_iso_it_flush_completions;
+ iface->create_source = fw_iso_it_create_source;
}
/**
- * hinoko_fw_iso_tx_new:
+ * hinoko_fw_iso_it_new:
*
- * Instantiate [class@FwIsoTx] object and return the instance.
+ * Instantiate [class@FwIsoIt] object and return the instance.
*
- * Returns: an instance of [class@FwIsoTx].
+ * Returns: an instance of [class@FwIsoIt].
*/
-HinokoFwIsoTx *hinoko_fw_iso_tx_new(void)
+HinokoFwIsoIt *hinoko_fw_iso_it_new(void)
{
- return g_object_new(HINOKO_TYPE_FW_ISO_TX, NULL);
+ return g_object_new(HINOKO_TYPE_FW_ISO_IT, NULL);
}
/**
- * hinoko_fw_iso_tx_allocate:
- * @self: A [class@FwIsoTx].
+ * hinoko_fw_iso_it_allocate:
+ * @self: A [class@FwIsoIt].
* @path: A path to any Linux FireWire character device.
* @scode: A [enum@FwScode] to indicate speed of isochronous communication.
* @channel: An isochronous channel to transfer, up to 63.
@@ -237,23 +237,23 @@ HinokoFwIsoTx *hinoko_fw_iso_tx_new(void)
*
* Since: 0.7.
*/
-gboolean hinoko_fw_iso_tx_allocate(HinokoFwIsoTx *self, const char *path, HinokoFwScode scode,
+gboolean hinoko_fw_iso_it_allocate(HinokoFwIsoIt *self, const char *path, HinokoFwScode scode,
guint channel, guint header_size, GError **error)
{
- HinokoFwIsoTxPrivate *priv;
+ HinokoFwIsoItPrivate *priv;
- g_return_val_if_fail(HINOKO_IS_FW_ISO_TX(self), FALSE);
+ g_return_val_if_fail(HINOKO_IS_FW_ISO_IT(self), FALSE);
g_return_val_if_fail(channel <= IEEE1394_MAX_CHANNEL, FALSE);
g_return_val_if_fail(error == NULL || *error == NULL, FALSE);
- priv = hinoko_fw_iso_tx_get_instance_private(self);
+ priv = hinoko_fw_iso_it_get_instance_private(self);
return fw_iso_ctx_state_allocate(&priv->state, path, HINOKO_FW_ISO_CTX_MODE_IT, scode,
channel, header_size, error);
}
/**
- * hinoko_fw_iso_tx_map_buffer:
- * @self: A [class@FwIsoTx].
+ * hinoko_fw_iso_it_map_buffer:
+ * @self: A [class@FwIsoIt].
* @maximum_bytes_per_payload: The number of bytes for payload of IT context.
* @payloads_per_buffer: The number of payloads of IT context in buffer.
* @error: A [struct@GLib.Error].
@@ -264,22 +264,22 @@ gboolean hinoko_fw_iso_tx_allocate(HinokoFwIsoTx *self, const char *path, Hinoko
*
* Since: 0.7.
*/
-gboolean hinoko_fw_iso_tx_map_buffer(HinokoFwIsoTx *self, guint maximum_bytes_per_payload,
+gboolean hinoko_fw_iso_it_map_buffer(HinokoFwIsoIt *self, guint maximum_bytes_per_payload,
guint payloads_per_buffer, GError **error)
{
- HinokoFwIsoTxPrivate *priv;
+ HinokoFwIsoItPrivate *priv;
- g_return_val_if_fail(HINOKO_IS_FW_ISO_TX(self), FALSE);
+ g_return_val_if_fail(HINOKO_IS_FW_ISO_IT(self), FALSE);
g_return_val_if_fail(error == NULL || *error == NULL, FALSE);
- priv = hinoko_fw_iso_tx_get_instance_private(self);
+ priv = hinoko_fw_iso_it_get_instance_private(self);
return fw_iso_ctx_state_map_buffer(&priv->state, maximum_bytes_per_payload,
payloads_per_buffer, error);
}
/**
- * hinoko_fw_iso_tx_start:
- * @self: A [class@FwIsoTx].
+ * hinoko_fw_iso_it_start:
+ * @self: A [class@FwIsoIt].
* @cycle_match: (array fixed-size=2) (element-type guint16) (in) (nullable): The isochronous cycle
* to start packet processing. The first element should be the second part of
* isochronous cycle, up to 3. The second element should be the cycle part of
@@ -292,24 +292,24 @@ gboolean hinoko_fw_iso_tx_map_buffer(HinokoFwIsoTx *self, guint maximum_bytes_pe
*
* Since: 0.7.
*/
-gboolean hinoko_fw_iso_tx_start(HinokoFwIsoTx *self, const guint16 *cycle_match, GError **error)
+gboolean hinoko_fw_iso_it_start(HinokoFwIsoIt *self, const guint16 *cycle_match, GError **error)
{
- HinokoFwIsoTxPrivate *priv;
+ HinokoFwIsoItPrivate *priv;
- g_return_val_if_fail(HINOKO_IS_FW_ISO_TX(self), FALSE);
+ g_return_val_if_fail(HINOKO_IS_FW_ISO_IT(self), FALSE);
g_return_val_if_fail(cycle_match == NULL ||
cycle_match[0] <= OHCI1394_IT_contextControl_cycleMatch_MAX_SEC ||
cycle_match[1] <= OHCI1394_IT_contextControl_cycleMatch_MAX_CYCLE,
FALSE);
g_return_val_if_fail(error == NULL || *error == NULL, FALSE);
- priv = hinoko_fw_iso_tx_get_instance_private(self);
+ priv = hinoko_fw_iso_it_get_instance_private(self);
return fw_iso_ctx_state_start(&priv->state, cycle_match, 0, 0, error);
}
/**
- * hinoko_fw_iso_tx_register_packet:
- * @self: A [class@FwIsoTx].
+ * hinoko_fw_iso_it_register_packet:
+ * @self: A [class@FwIsoIt].
* @tags: The value of tag field for isochronous packet to register.
* @sync_code: The value of sync field in isochronous packet header for packet processing, up to 15.
* @header: (array length=header_length) (nullable): The header of IT context for isochronous
@@ -325,24 +325,24 @@ gboolean hinoko_fw_iso_tx_start(HinokoFwIsoTx *self, const guint16 *cycle_match,
* Register packet data with header and payload for IT context. The content of given header and
* payload is appended into data field of isochronous packet to be sent. The caller can schedule
* hardware interrupt to generate interrupt event. In detail, please refer to documentation about
- * [signal@FwIsoTx::interrupted].
+ * [signal@FwIsoIt::interrupted].
*
* Returns: TRUE if the overall operation finishes successful, otherwise FALSE.
*
* Since: 0.7.
*/
-gboolean hinoko_fw_iso_tx_register_packet(HinokoFwIsoTx *self, HinokoFwIsoCtxMatchFlag tags,
+gboolean hinoko_fw_iso_it_register_packet(HinokoFwIsoIt *self, HinokoFwIsoCtxMatchFlag tags,
guint sync_code,
const guint8 *header, guint header_length,
const guint8 *payload, guint payload_length,
gboolean schedule_interrupt, GError **error)
{
- HinokoFwIsoTxPrivate *priv;
+ HinokoFwIsoItPrivate *priv;
const guint8 *frames;
guint frame_size;
gboolean skip;
- g_return_val_if_fail(HINOKO_IS_FW_ISO_TX(self), FALSE);
+ g_return_val_if_fail(HINOKO_IS_FW_ISO_IT(self), FALSE);
g_return_val_if_fail(sync_code <= IEEE1394_MAX_SYNC_CODE, FALSE);
g_return_val_if_fail((header != NULL && header_length > 0) ||
(header == NULL && header_length == 0), FALSE);
@@ -350,7 +350,7 @@ gboolean hinoko_fw_iso_tx_register_packet(HinokoFwIsoTx *self, HinokoFwIsoCtxMat
(payload == NULL && payload_length == 0), FALSE);
g_return_val_if_fail(error == NULL || *error == NULL, FALSE);
- priv = hinoko_fw_iso_tx_get_instance_private(self);
+ priv = hinoko_fw_iso_it_get_instance_private(self);
skip = FALSE;
if (header_length == 0 && payload_length == 0)
diff --git a/src/fw_iso_tx.h b/src/fw_iso_it.h
index ef3ec7f..b1d1974 100644
--- a/src/fw_iso_tx.h
+++ b/src/fw_iso_it.h
@@ -1,21 +1,21 @@
// SPDX-License-Identifier: LGPL-2.1-or-later
-#ifndef __HINOKO_FW_ISO_TX_H__
-#define __HINOKO_FW_ISO_TX_H__
+#ifndef __HINOKO_FW_ISO_IT_H__
+#define __HINOKO_FW_ISO_IT_H__
#include <hinoko.h>
G_BEGIN_DECLS
-#define HINOKO_TYPE_FW_ISO_TX (hinoko_fw_iso_tx_get_type())
+#define HINOKO_TYPE_FW_ISO_IT (hinoko_fw_iso_it_get_type())
-G_DECLARE_DERIVABLE_TYPE(HinokoFwIsoTx, hinoko_fw_iso_tx, HINOKO, FW_ISO_TX, GObject);
+G_DECLARE_DERIVABLE_TYPE(HinokoFwIsoIt, hinoko_fw_iso_it, HINOKO, FW_ISO_IT, GObject);
-struct _HinokoFwIsoTxClass {
+struct _HinokoFwIsoItClass {
GObjectClass parent_class;
/**
- * HinokoFwIsoTxClass::interrupted:
- * @self: A [class@FwIsoTx].
+ * HinokoFwIsoItClass::interrupted:
+ * @self: A [class@FwIsoIt].
* @sec: The sec part of isochronous cycle when interrupt occurs, up to 7.
* @cycle: The cycle part of of isochronous cycle when interrupt occurs, up to 7999.
* @tstamp: (array length=tstamp_length) (element-type guint8): A series of timestamps for
@@ -23,24 +23,24 @@ struct _HinokoFwIsoTxClass {
* @tstamp_length: the number of bytes for @tstamp.
* @count: the number of handled packets.
*
- * Class closure for the [signal@FwIsoTx::interrupted] signal.
+ * Class closure for the [signal@FwIsoIt::interrupted] signal.
*/
- void (*interrupted)(HinokoFwIsoTx *self, guint sec, guint cycle,
+ void (*interrupted)(HinokoFwIsoIt *self, guint sec, guint cycle,
const guint8 *tstamp, guint tstamp_length,
guint count);
};
-HinokoFwIsoTx *hinoko_fw_iso_tx_new(void);
+HinokoFwIsoIt *hinoko_fw_iso_it_new(void);
-gboolean hinoko_fw_iso_tx_allocate(HinokoFwIsoTx *self, const char *path, HinokoFwScode scode,
+gboolean hinoko_fw_iso_it_allocate(HinokoFwIsoIt *self, const char *path, HinokoFwScode scode,
guint channel, guint header_size, GError **error);
-gboolean hinoko_fw_iso_tx_map_buffer(HinokoFwIsoTx *self, guint maximum_bytes_per_payload,
+gboolean hinoko_fw_iso_it_map_buffer(HinokoFwIsoIt *self, guint maximum_bytes_per_payload,
guint payloads_per_buffer, GError **error);
-gboolean hinoko_fw_iso_tx_start(HinokoFwIsoTx *self, const guint16 *cycle_match, GError **error);
+gboolean hinoko_fw_iso_it_start(HinokoFwIsoIt *self, const guint16 *cycle_match, GError **error);
-gboolean hinoko_fw_iso_tx_register_packet(HinokoFwIsoTx *self, HinokoFwIsoCtxMatchFlag tags,
+gboolean hinoko_fw_iso_it_register_packet(HinokoFwIsoIt *self, HinokoFwIsoCtxMatchFlag tags,
guint sync_code,
const guint8 *header, guint header_length,
const guint8 *payload, guint payload_length,
diff --git a/src/hinoko.h b/src/hinoko.h
index 382902a..dbc39d0 100644
--- a/src/hinoko.h
+++ b/src/hinoko.h
@@ -18,7 +18,7 @@
#include <fw_iso_ctx.h>
#include <fw_iso_ir_single.h>
#include <fw_iso_ir_multiple.h>
-#include <fw_iso_tx.h>
+#include <fw_iso_it.h>
#include <fw_iso_resource.h>
#include <fw_iso_resource_auto.h>
diff --git a/src/hinoko.map b/src/hinoko.map
index 365606f..56371c4 100644
--- a/src/hinoko.map
+++ b/src/hinoko.map
@@ -3,8 +3,6 @@ HINOKO_0_1_0 {
"hinoko_fw_iso_ctx_mode_get_type";
"hinoko_fw_scode_get_type";
"hinoko_fw_iso_ctx_match_flag_get_type";
-
- "hinoko_fw_iso_tx_new";
local:
*;
};
@@ -47,12 +45,6 @@ HINOKO_0_7_0 {
"hinoko_fw_iso_ctx_create_source";
"hinoko_fw_iso_ctx_flush_completions";
- "hinoko_fw_iso_tx_get_type";
- "hinoko_fw_iso_tx_allocate";
- "hinoko_fw_iso_tx_map_buffer";
- "hinoko_fw_iso_tx_register_packet";
- "hinoko_fw_iso_tx_start";
-
"hinoko_fw_iso_resource_get_type";
"hinoko_fw_iso_resource_open";
"hinoko_fw_iso_resource_create_source";
@@ -84,4 +76,11 @@ HINOKO_0_8_0 {
"hinoko_fw_iso_ir_multiple_map_buffer";
"hinoko_fw_iso_ir_multiple_start";
"hinoko_fw_iso_ir_multiple_get_payload";
+
+ "hinoko_fw_iso_it_new";
+ "hinoko_fw_iso_it_get_type";
+ "hinoko_fw_iso_it_allocate";
+ "hinoko_fw_iso_it_map_buffer";
+ "hinoko_fw_iso_it_register_packet";
+ "hinoko_fw_iso_it_start";
} HINOKO_0_7_0;
diff --git a/src/meson.build b/src/meson.build
index 43580da..8b8ea6f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -10,7 +10,7 @@ sources = [
'fw_iso_ctx.c',
'fw_iso_ir_single.c',
'fw_iso_ir_multiple.c',
- 'fw_iso_tx.c',
+ 'fw_iso_it.c',
'cycle_timer.c',
'fw_iso_resource.c',
'fw_iso_resource_auto.c',
@@ -22,7 +22,7 @@ headers = [
'fw_iso_ctx.h',
'fw_iso_ir_single.h',
'fw_iso_ir_multiple.h',
- 'fw_iso_tx.h',
+ 'fw_iso_it.h',
'cycle_timer.h',
'fw_iso_resource.h',
'fw_iso_resource_auto.h',
diff --git a/tests/fw-iso-tx b/tests/fw-iso-it
index dfd6af2..69ef456 100755
--- a/tests/fw-iso-tx
+++ b/tests/fw-iso-it
@@ -9,7 +9,7 @@ import gi
gi.require_version('Hinoko', '0.0')
from gi.repository import Hinoko
-target_type = Hinoko.FwIsoTx
+target_type = Hinoko.FwIsoIt
props = (
# From interface.
'bytes-per-chunk',
diff --git a/tests/meson.build b/tests/meson.build
index 77f04b6..6b4c1cc 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -3,7 +3,7 @@ tests = [
'fw-iso-ctx',
'fw-iso-ir-single',
'fw-iso-ir-multiple',
- 'fw-iso-tx',
+ 'fw-iso-it',
'fw-iso-resource',
'fw-iso-resource-auto',
'fw-iso-resource-once',