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

Fixed network boot.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25990 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2008-06-17 09:28:00 +00:00
parent 872781f355
commit 14a3b510e8
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/NetBootArchive
+5 -5
View File
@@ -42,7 +42,7 @@ AddFilesToNetBootArchive beos system add-ons kernel console : vga_text ;
AddFilesToNetBootArchive beos system add-ons kernel file_systems
: $(BEOS_ADD_ONS_FILE_SYSTEMS) ;
AddFilesToNetBootArchive beos system add-ons kernel generic
: block_io fast_log ide_adapter locked_pool scsi_periph ;
: block_io ide_adapter locked_pool scsi_periph ;
AddFilesToNetBootArchive beos system add-ons kernel partitioning_systems
: intel session ;
AddFilesToNetBootArchive beos system add-ons kernel interrupt_controllers
@@ -53,8 +53,8 @@ if $(TARGET_ARCH) = x86 {
}
# drivers
AddDriversToNetBootArchive disk scsi : scsi_cd scsi_dsk ;
#AddDriversToNetBootArchive disk virtual : nbd ;
AddDriversToNetBootArchive disk scsi : scsi_cd scsi_disk ;
#AddDriversToNetBootArchive disk virtual : nbd ;
AddDriversToNetBootArchive disk virtual : remote_disk ;
AddDriversToNetBootArchive net : $(BEOS_ADD_ONS_DRIVERS_NET) ;
@@ -86,7 +86,7 @@ AddBootModuleSymlinksToNetBootArchive
$(BEOS_ADD_ONS_BUS_MANAGERS)
ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112
$(BEOS_ADD_ONS_FILE_SYSTEMS)
block_io fast_log ide_adapter locked_pool scsi_periph
block_io ide_adapter locked_pool scsi_periph
intel session
$(PPC_ONLY)openpic
$(X86_ONLY)generic_x86
@@ -95,7 +95,7 @@ AddBootModuleSymlinksToNetBootArchive
$(BEOS_ADD_ONS_DRIVERS_NET)
stack
$(BEOS_NETWORK_DEVICES)
$(BEOS_NETWORK_DATALINK_PROTOCOLS)
$(BEOS_NETWORK_DATALINK_PROTOCOLS)
$(BEOS_NETWORK_PPP)
$(BEOS_NETWORK_PROTOCOLS)
;
src/add-ons/kernel/drivers/disk/virtual/remote_disk/Jamfile
+2 -4
View File
@@ -1,9 +1,7 @@
SubDir HAIKU_TOP src add-ons kernel drivers disk virtual remote_disk ;
UsePrivateHeaders kernel ;
UseArchHeaders $(TARGET_ARCH) ;
UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
# TODO: Ugly!
UsePrivateKernelHeaders ;
UsePrivateSystemHeaders ;
KernelAddon remote_disk :
remote_disk.cpp
src/add-ons/kernel/drivers/disk/virtual/remote_disk/remote_disk.cpp
+4 -4
View File
@@ -35,10 +35,10 @@ struct RemoteDiskDevice : recursive_lock {
bigtime_t lastInitRetryTime;
RemoteDiskDevice()
: remoteDisk(NULL),
lastInitRetryTime(-1)
:
remoteDisk(NULL),
lastInitRetryTime(-1)
{
sem = -1;
}
~RemoteDiskDevice()
@@ -236,7 +236,7 @@ remote_disk_control(void* cookie, uint32 op, void* arg, size_t len)
*(bool*)arg = true;
return B_OK;
case B_GET_WRITE_STATUS:
case B_GET_WRITE_STATUS:
TRACE(("remote_disk: B_GET_WRITE_STATUS\n"));
*(bool*)arg = true;
return B_OK;