From ead41a8810f83cfff197fc93d472c078a911df7b Mon Sep 17 00:00:00 2001 From: Hidetoshi Shimokawa Date: Sun, 8 Jul 2007 11:47:52 +0000 Subject: [PATCH] Fix a bug of retrieving configuration ROM. - Handle directories and leaves other than unit directories and text leaves correctly. - Now we can retrieve CROM of iSight correctly. Approved by: re (hrs) Tested by: flz MFC after: 3 days --- sys/dev/firewire/firewire.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/firewire/firewire.c b/sys/dev/firewire/firewire.c index 3279dbac697..4015d5632bd 100644 --- a/sys/dev/firewire/firewire.c +++ b/sys/dev/firewire/firewire.c @@ -1455,9 +1455,9 @@ fw_explore_csrblock(struct fw_device *fwdev, int offset, int recur) return (0); for (i = 0; i < dir->crc_len; i ++, offset += sizeof(uint32_t)) { - if (reg[i].key == CROM_UDIR) + if ((reg[i].key & CSRTYPE_MASK) == CSRTYPE_D) recur = 1; - else if (reg[i].key == CROM_TEXTLEAF) + else if ((reg[i].key & CSRTYPE_MASK) == CSRTYPE_L) recur = 0; else continue;