mirror of
https://gitlab.com/etherlab.org/ethercat.git
synced 2026-08-19 01:21:54 +08:00
Create class device with device_number information in sysfs.
This commit is contained in:
+13
-1
@@ -76,7 +76,8 @@ int ec_master_init(ec_master_t *master, /**< EtherCAT master */
|
||||
unsigned int index, /**< master index */
|
||||
const uint8_t *main_mac, /**< MAC address of main device */
|
||||
const uint8_t *backup_mac, /**< MAC address of backup device */
|
||||
dev_t device_number /**< Character device number. */
|
||||
dev_t device_number, /**< Character device number. */
|
||||
struct class *class /**< Device class. */
|
||||
)
|
||||
{
|
||||
unsigned int i;
|
||||
@@ -170,9 +171,19 @@ int ec_master_init(ec_master_t *master, /**< EtherCAT master */
|
||||
// init character device
|
||||
if (ec_cdev_init(&master->cdev, master, device_number))
|
||||
goto out_clear_fsm;
|
||||
|
||||
master->class_device = class_device_create(class,
|
||||
MKDEV(MAJOR(device_number), master->index),
|
||||
NULL, "EtherCAT%u", master->index);
|
||||
if (IS_ERR(master->class_device)) {
|
||||
EC_ERR("Failed to create class device!\n");
|
||||
goto out_clear_cdev;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
out_clear_cdev:
|
||||
ec_cdev_clear(&master->cdev);
|
||||
out_clear_fsm:
|
||||
ec_fsm_master_clear(&master->fsm);
|
||||
ec_datagram_clear(&master->fsm_datagram);
|
||||
@@ -192,6 +203,7 @@ void ec_master_clear(
|
||||
ec_master_t *master /**< EtherCAT master */
|
||||
)
|
||||
{
|
||||
class_device_unregister(master->class_device);
|
||||
ec_cdev_clear(&master->cdev);
|
||||
#ifdef EC_EOE
|
||||
ec_master_clear_eoe_handlers(master);
|
||||
|
||||
+2
-1
@@ -84,6 +84,7 @@ struct ec_master {
|
||||
unsigned int reserved; /**< non-zero, if the master is reserved for RT */
|
||||
|
||||
ec_cdev_t cdev; /**< Master character device. */
|
||||
struct class_device *class_device; /**< Master class device. */
|
||||
|
||||
ec_device_t main_device; /**< EtherCAT device */
|
||||
const uint8_t *main_mac; /**< MAC address of main device */
|
||||
@@ -167,7 +168,7 @@ struct ec_master {
|
||||
|
||||
// master creation/deletion
|
||||
int ec_master_init(ec_master_t *, unsigned int, const uint8_t *,
|
||||
const uint8_t *, dev_t);
|
||||
const uint8_t *, dev_t, struct class *);
|
||||
void ec_master_clear(ec_master_t *);
|
||||
|
||||
// mode transitions
|
||||
|
||||
+1
-1
@@ -144,7 +144,7 @@ int __init ec_init_module(void)
|
||||
|
||||
for (i = 0; i < master_count; i++) {
|
||||
if (ec_master_init(&masters[i], i, macs[i][0], macs[i][1],
|
||||
device_number)) {
|
||||
device_number, class)) {
|
||||
ret = -ENOMEM;
|
||||
goto out_free_masters;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user