hw/net/can: Make CanBusClientInfo::can_receive() return a boolean
The CanBusClientInfo::can_receive handler return whether the device can or can not receive new frames. Make it obvious by returning a boolean type. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
parent
b8c4b67e3e
commit
767cc9a9c1
@ -395,7 +395,7 @@ static void allwinner_sun8i_emac_flush_desc(FrameDescriptor *desc,
|
|||||||
cpu_physical_memory_write(phys_addr, desc, sizeof(*desc));
|
cpu_physical_memory_write(phys_addr, desc, sizeof(*desc));
|
||||||
}
|
}
|
||||||
|
|
||||||
static int allwinner_sun8i_emac_can_receive(NetClientState *nc)
|
static bool allwinner_sun8i_emac_can_receive(NetClientState *nc)
|
||||||
{
|
{
|
||||||
AwSun8iEmacState *s = qemu_get_nic_opaque(nc);
|
AwSun8iEmacState *s = qemu_get_nic_opaque(nc);
|
||||||
FrameDescriptor desc;
|
FrameDescriptor desc;
|
||||||
|
@ -733,21 +733,21 @@ uint64_t can_sja_mem_read(CanSJA1000State *s, hwaddr addr, unsigned size)
|
|||||||
return temp;
|
return temp;
|
||||||
}
|
}
|
||||||
|
|
||||||
int can_sja_can_receive(CanBusClientState *client)
|
bool can_sja_can_receive(CanBusClientState *client)
|
||||||
{
|
{
|
||||||
CanSJA1000State *s = container_of(client, CanSJA1000State, bus_client);
|
CanSJA1000State *s = container_of(client, CanSJA1000State, bus_client);
|
||||||
|
|
||||||
if (s->clock & 0x80) { /* PeliCAN Mode */
|
if (s->clock & 0x80) { /* PeliCAN Mode */
|
||||||
if (s->mode & 0x01) { /* reset mode. */
|
if (s->mode & 0x01) { /* reset mode. */
|
||||||
return 0;
|
return false;
|
||||||
}
|
}
|
||||||
} else { /* BasicCAN mode */
|
} else { /* BasicCAN mode */
|
||||||
if (s->control & 0x01) {
|
if (s->control & 0x01) {
|
||||||
return 0;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return 1; /* always return 1, when operation mode */
|
return true; /* always return true, when operation mode */
|
||||||
}
|
}
|
||||||
|
|
||||||
ssize_t can_sja_receive(CanBusClientState *client, const qemu_can_frame *frames,
|
ssize_t can_sja_receive(CanBusClientState *client, const qemu_can_frame *frames,
|
||||||
|
@ -137,7 +137,7 @@ void can_sja_disconnect(CanSJA1000State *s);
|
|||||||
|
|
||||||
int can_sja_init(CanSJA1000State *s, qemu_irq irq);
|
int can_sja_init(CanSJA1000State *s, qemu_irq irq);
|
||||||
|
|
||||||
int can_sja_can_receive(CanBusClientState *client);
|
bool can_sja_can_receive(CanBusClientState *client);
|
||||||
|
|
||||||
ssize_t can_sja_receive(CanBusClientState *client,
|
ssize_t can_sja_receive(CanBusClientState *client,
|
||||||
const qemu_can_frame *frames, size_t frames_cnt);
|
const qemu_can_frame *frames, size_t frames_cnt);
|
||||||
|
@ -83,7 +83,7 @@ typedef struct CanBusClientState CanBusClientState;
|
|||||||
typedef struct CanBusState CanBusState;
|
typedef struct CanBusState CanBusState;
|
||||||
|
|
||||||
typedef struct CanBusClientInfo {
|
typedef struct CanBusClientInfo {
|
||||||
int (*can_receive)(CanBusClientState *);
|
bool (*can_receive)(CanBusClientState *);
|
||||||
ssize_t (*receive)(CanBusClientState *,
|
ssize_t (*receive)(CanBusClientState *,
|
||||||
const struct qemu_can_frame *frames, size_t frames_cnt);
|
const struct qemu_can_frame *frames, size_t frames_cnt);
|
||||||
} CanBusClientInfo;
|
} CanBusClientInfo;
|
||||||
|
@ -110,9 +110,9 @@ static void can_host_socketcan_read(void *opaque)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static int can_host_socketcan_can_receive(CanBusClientState *client)
|
static bool can_host_socketcan_can_receive(CanBusClientState *client)
|
||||||
{
|
{
|
||||||
return 1;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static ssize_t can_host_socketcan_receive(CanBusClientState *client,
|
static ssize_t can_host_socketcan_receive(CanBusClientState *client,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user