On Sun, 10 Jul 2011 22:44:23 +0200, Jérôme Duval wrote:
2011/7/9 <zharik@xxxxxx>:Author: siarzhuk Date: 2011-07-09 11:39:58 +0200 (Sat, 09 Jul 2011) New Revision: 42398 Changeset: https://dev.haiku-os.org/changeset/42398 Modified: haiku/trunk/src/add-ons/kernel/drivers/network/3com/dev/xl/if_xl.c Log: Local Haiku change, missed during update to FreeBSD 8.2 restored.It's usually easier to keep the lines in a #ifndef __HAIKU__ than removing them.
Surely. Looks like I have just confused by the same issue in previous if_xl.c version. Mentioned "CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_INTR_ACK|(status & XL_INTRS));" call in FreeBSD version lives in the beginning of "while" cycle. But Haiku has moved it to the end of this cycle into corresponding #ifdef __HAIKU__ section. During updating the source this call occured both in the beginning and at the end - so I have removed the first one later. But I tend to agree with you and going to move it under the first #undef __HAIKU__ section. This will be a kind of hint for the porters to prevent from the same issues in the future. Thank you for pointing out.
-- Kind Regards, S.Zharski