Skip to content

esp32s3: expose canbus machine property and wire TWAI peripheral #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
haoruizhou wants to merge 1 commit into
base: esp-develop
Choose a base branch
from
Draft

esp32s3: expose canbus machine property and wire TWAI peripheral #147

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions hw/xtensa/esp32s3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
#include "hw/misc/esp32s3_xts_aes.h"
#include "hw/misc/esp32s3_pms.h"
#include "hw/net/can/esp32s3_twai.h"
#include "net/can_emu.h"

#include "cpu_esp32s3.h"

Expand Down Expand Up @@ -318,6 +319,7 @@ struct Esp32s3MachineState {

Esp32s3SocState esp32s3;
DeviceState *flash_dev;
CanBusState *canbus;
};
#define TYPE_ESP32S3_MACHINE MACHINE_TYPE_NAME("esp32s3")

Expand Down Expand Up @@ -633,6 +635,11 @@ static void esp32s3_machine_init(MachineState *machine)
// qdev_prop_set_chr(DEVICE(ss), "serial1", serial_hd(1));
// qdev_prop_set_chr(DEVICE(ss), "serial2", serial_hd(2));

if (ms->canbus) {
object_property_set_link(OBJECT(&ss->twai), "canbus",
OBJECT(ms->canbus), &error_abort);
}

qdev_realize(DEVICE(ss), NULL, &error_fatal);

object_initialize_child(OBJECT(ss), "extmem", &ss->cache, TYPE_ESP32S3_CACHE);
Expand Down Expand Up @@ -984,6 +991,11 @@ static void esp32s3_machine_class_init(ObjectClass *oc, void *data)
mc->default_cpus = 2;
mc->default_ram_size = 0;
mc->fixup_ram_size = esp32s3_fixup_ram_size;

object_class_property_add_link(oc, "canbus", TYPE_CAN_BUS,
offsetof(Esp32s3MachineState, canbus),
object_property_allow_set_link,
OBJ_PROP_LINK_STRONG);
}

static const TypeInfo esp32s3_info = {
Expand Down