[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1193824773.32459.22.camel@violet>
Date: Wed, 31 Oct 2007 10:59:32 +0100
From: Marcel Holtmann <marcel@...tmann.org>
To: Dave Young <hidave.darkstar@...il.com>
Cc: David Miller <davem@...emloft.net>, linux-kernel@...r.kernel.org,
bluez-devel@...ts.sourceforge.net
Subject: Re: [PATCH]bluetooth: hci_sysfs connection bus_id add support for
diffrent hci device
Hi Dave,
> > > > diff -upr linux/net/bluetooth/hci_sysfs.c linux.new/net/bluetooth/hci_sysfs.c
> > > > --- linux/net/bluetooth/hci_sysfs.c 2007-10-31 10:21:00.000000000 +0800
> > > > +++ linux.new/net/bluetooth/hci_sysfs.c 2007-10-31 10:21:55.000000000 +0800
> > > > @@ -302,7 +302,8 @@ void hci_conn_add_sysfs(struct hci_conn
> > > > conn->dev.release = bt_release;
> > > >
> > > > snprintf(conn->dev.bus_id, BUS_ID_SIZE,
> > > > - "%s%2.2X%2.2X%2.2X%2.2X%2.2X%2.2X",
> > > > + "%s%s%2.2X%2.2X%2.2X%2.2X%2.2X%2.2X",
> > > > + hdev->name,
> > > > conn->type == ACL_LINK ? "acl" : "sco",
> > > > ba->b[5], ba->b[4], ba->b[3],
> > > > ba->b[2], ba->b[1], ba->b[0]);
> > >
> > > This might not work.
> > >
> > > Your device's name is already 15 characters long,
> > > BUS_ID_SIZE is 20, and it seems hdev->name could
> > > easily overflow the 4 or 5 characters of space
> > > remaining.
> >
> > and should also be not needed since their parents are different. However
> > we had to add the connections to a bus. Otherwise the userspace will
> > never see them. I have to think about the right solution for this
> > problem.
>
> Maybe we can use this instead:
> snprintf(conn->dev.bus_id, BUS_ID_SIZE,
> - "%s%2.2X%2.2X%2.2X%2.2X%2.2X%2.2X",
> + "%s%s%2.2X%2.2X%2.2X%2.2X%2.2X%2.2X",
> + hdev->name + 3,
> conn->type == ACL_LINK ? "acl" : "sco",
> ba->b[5], ba->b[4], ba->b[3],
> ba->b[2], ba->b[1], ba->b[0]);
I had a look on how other subsystems handle this case and yes, they
duplicate the id number from its parent device. So I applied the
attached patch to my tree.
The best would be to use '"%d-%d", hdev->id, conn->handle', but at the
time we create the hci_conn structure and add the sysfs entry the
connection handle is not know yet. I have to look into that and see if
that can be changed.
Regards
Marcel
View attachment "patch" of type "text/x-patch" (559 bytes)
Powered by blists - more mailing lists