[haiku-commits] haiku: hrev46082 - src/add-ons/kernel/drivers/disk/norflash
- From: ithamar@xxxxxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 17 Sep 2013 05:27:45 +0200 (CEST)
hrev46082 adds 1 changeset to branch 'master'
old head: af1c0b55ca4c6303ce2c2d8789442421ddda2bc8
new head: 00e13e215e687183d8192b339232c941bddb5c8f
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=00e13e2+%5Eaf1c0b5
----------------------------------------------------------------------------
00e13e2: norflash: do not accept any device as a valid 'norflash'
Seems the original code was a little *too* simple ;-)
[ Ithamar R. Adema <ithamar@xxxxxxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev46082
Commit: 00e13e215e687183d8192b339232c941bddb5c8f
URL: http://cgit.haiku-os.org/haiku/commit/?id=00e13e2
Author: Ithamar R. Adema <ithamar@xxxxxxxxxxxxxxxxxxx>
Date: Tue Sep 17 03:26:29 2013 UTC
----------------------------------------------------------------------------
1 file changed, 9 insertions(+), 1 deletion(-)
src/add-ons/kernel/drivers/disk/norflash/norflash.cpp | 10 +++++++++-
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/drivers/disk/norflash/norflash.cpp
b/src/add-ons/kernel/drivers/disk/norflash/norflash.cpp
index 4bd20bd..1fd7be7 100644
--- a/src/add-ons/kernel/drivers/disk/norflash/norflash.cpp
+++ b/src/add-ons/kernel/drivers/disk/norflash/norflash.cpp
@@ -165,8 +165,16 @@ nor_write(void *_cookie, off_t position, const void *data,
size_t *numbytes)
static float
nor_supports_device(device_node *parent)
{
+ const char *bus;
TRACE("supports_device\n");
- return 0.6;
+
+ if (sDeviceManager->get_attr_string(parent, B_DEVICE_BUS, &bus, false))
+ return B_ERROR;
+
+ if (strcmp(bus, "generic"))
+ return 0.0;
+
+ return 1.0;
}
Other related posts:
- » [haiku-commits] haiku: hrev46082 - src/add-ons/kernel/drivers/disk/norflash - ithamar
