i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch by JiSheng Zhang to fix firewire gcc4 build instability.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26272 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Pfeiffer
2008-07-06 07:45:09 +00:00
parent 1aa3d2e3f3
commit 504092a4de
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+2 -2
View File
@@ -30,7 +30,7 @@ BEOS_BIN = "[" addattr alert arp base64 basename bc beep bootman bzip2 cal cat
csplit ctags cut date dc dd desklink df diff diff3 dircolors dirname csplit ctags cut date dc dd desklink df diff diff3 dircolors dirname
draggers driveinfo dstcheck du echo eject env error expand expr draggers driveinfo dstcheck du echo eject env error expand expr
expr factor false fdinfo ffm find finddir fmt fold fortune frcode ftp ftpd expr factor false fdinfo ffm find finddir fmt fold fortune frcode ftp ftpd
funzip #fwcontrol funzip fwcontrol
gawk $(X86_ONLY)gdb grep groups gzip gzexe hd head hey hostname id ident gawk $(X86_ONLY)gdb grep groups gzip gzexe hd head hey hostname id ident
ideinfo idestatus ifconfig <bin>install installsound iroster isvolume join ideinfo idestatus ifconfig <bin>install installsound iroster isvolume join
keymap kill less lessecho lesskey link listarea listattr listimage listdev keymap kill less lessecho lesskey link listarea listattr listimage listdev
@@ -171,7 +171,7 @@ AddDriversToHaikuImage : console dprintf $(X86_ONLY)keyboard null
random <driver>tty zero ; random <driver>tty zero ;
AddDriversToHaikuImage audio hmulti : $(BEOS_ADD_ONS_DRIVERS_AUDIO) ; AddDriversToHaikuImage audio hmulti : $(BEOS_ADD_ONS_DRIVERS_AUDIO) ;
AddDriversToHaikuImage midi : $(BEOS_ADD_ONS_DRIVERS_MIDI) ; AddDriversToHaikuImage midi : $(BEOS_ADD_ONS_DRIVERS_MIDI) ;
AddDriversToHaikuImage bus : usb_raw ; # fw_raw AddDriversToHaikuImage bus : usb_raw fw_raw ;
AddDriversToHaikuImage disk floppy : $(X86_ONLY)pc_floppy ; AddDriversToHaikuImage disk floppy : $(X86_ONLY)pc_floppy ;
AddDriversToHaikuImage disk scsi : scsi_cd scsi_disk ; AddDriversToHaikuImage disk scsi : scsi_cd scsi_disk ;
AddDriversToHaikuImage disk usb : usb_disk ; AddDriversToHaikuImage disk usb : usb_disk ;
src/add-ons/kernel/bus_managers/firewire/firewire.c
+2 -4
View File
@@ -344,14 +344,12 @@ firewire_watchdog(void *arg)
*/ */
if (watchdog_clock > WATCHDOG_HZ * 15) if (watchdog_clock > WATCHDOG_HZ * 15)
// taskqueue_enqueue(fc->taskqueue, &fc->task_timeout); // taskqueue_enqueue(fc->taskqueue, &fc->task_timeout);
gDpc->queue_dpc(fc->taskqueue, firewire_xfer_timeout, fc); firewire_xfer_timeout(fc);
else else
watchdog_clock ++; watchdog_clock ++;
// callout_reset(&fc->timeout_callout, hz / WATCHDOG_HZ, // callout_reset(&fc->timeout_callout, hz / WATCHDOG_HZ,
// (void *)firewire_watchdog, (void *)fc); // (void *)firewire_watchdog, (void *)fc);
fc->timeout_callout = create_timer(firewire_watchdog, fc,
hz/WATCHDOG_HZ, B_ONE_SHOT_RELATIVE_TIMER);
} }
#if 0//to do #if 0//to do
@@ -447,7 +445,7 @@ firewire_attach(struct firewire_comm *fc, struct firewire_softc *sc)
// callout_reset(&sc->fc->timeout_callout, hz, // callout_reset(&sc->fc->timeout_callout, hz,
// (void *)firewire_watchdog, (void *)sc->fc); // (void *)firewire_watchdog, (void *)sc->fc);
fc->timeout_callout = create_timer(firewire_watchdog, fc, fc->timeout_callout = create_timer(firewire_watchdog, fc,
hz/WATCHDOG_HZ, B_ONE_SHOT_RELATIVE_TIMER); hz/WATCHDOG_HZ, B_PERIODIC_TIMER);
/* create thread */ /* create thread */
// kthread_create(fw_bus_probe_thread, (void *)fc, &fc->probe_thread, // kthread_create(fw_bus_probe_thread, (void *)fc, &fc->probe_thread,