The Coding Style Police is much more efficient than the HADOPI...

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38941 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2010-10-10 20:18:07 +00:00
parent 84092eea1a
commit 1d4497a8f6
3 changed files with 34 additions and 13 deletions
+8 -3
View File
@@ -19,6 +19,7 @@ UsePrivateHeaders [ FDirName storage ] ;
#SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons accelerants common ] ; #SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons accelerants common ] ;
KernelMergeObject boot_platform_amiga_m68k_shell.o : KernelMergeObject boot_platform_amiga_m68k_shell.o :
shell.S shell.S
: -Wa,--pcrel : -Wa,--pcrel
@@ -55,6 +56,7 @@ KernelMergeObject boot_platform_amiga_m68k_other.o :
: -fno-pic #-Wa,--pcrel : -fno-pic #-Wa,--pcrel
; ;
KernelMergeObject boot_platform_amiga_m68k.o : KernelMergeObject boot_platform_amiga_m68k.o :
: : : :
boot_platform_amiga_m68k_shell.o boot_platform_amiga_m68k_shell.o
@@ -63,9 +65,10 @@ KernelMergeObject boot_platform_amiga_m68k.o :
boot_arch_m68k_040.o boot_arch_m68k_040.o
; ;
# the bootsector in haiku_loader must be checksummed
rule ChecksumAmigaLoader { # the bootsector in haiku_loader must be checksummed
rule ChecksumAmigaLoader
{
local haikuLoader = $(1) ; local haikuLoader = $(1) ;
local checksummer = <build>fixup_amiga_boot_checksum ; local checksummer = <build>fixup_amiga_boot_checksum ;
@@ -75,7 +78,9 @@ rule ChecksumAmigaLoader {
} }
actions ChecksumAmigaLoader bind TARGET_CHECKSUM {
actions ChecksumAmigaLoader bind TARGET_CHECKSUM
{
$(TARGET_CHECKSUM) $(1) $(TARGET_CHECKSUM) $(1)
} }
@@ -21,13 +21,20 @@ extern "C" status_t
exec_error(int32 err) exec_error(int32 err)
{ {
switch (err) { switch (err) {
case IOERR_OPENFAIL: return B_DEV_BAD_DRIVE_NUM; case IOERR_OPENFAIL:
case IOERR_ABORTED: return EINTR; return B_DEV_BAD_DRIVE_NUM;
case IOERR_NOCMD: return EINVAL; case IOERR_ABORTED:
case IOERR_BADLENGTH: return EINVAL; return EINTR;
case IOERR_BADADDRESS: return EFAULT; case IOERR_NOCMD:
case IOERR_UNITBUSY: return B_DEV_NOT_READY; return EINVAL;
case IOERR_SELFTEST: return B_ERROR; case IOERR_BADLENGTH:
return EINVAL;
case IOERR_BADADDRESS:
return EFAULT;
case IOERR_UNITBUSY:
return B_DEV_NOT_READY;
case IOERR_SELFTEST:
return B_ERROR;
default: default:
return B_ERROR; return B_ERROR;
} }
+10 -1
View File
@@ -19,11 +19,13 @@ UsePrivateHeaders [ FDirName storage ] ;
#SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons accelerants common ] ; #SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons accelerants common ] ;
KernelMergeObject boot_platform_atari_m68k_shell.o : KernelMergeObject boot_platform_atari_m68k_shell.o :
shell.S shell.S
: -Wa,--pcrel : -Wa,--pcrel
; ;
# cpu-specific stuff # cpu-specific stuff
# should be moved to boot/arch/m68k/... # should be moved to boot/arch/m68k/...
# TODO: add 020+68851 support # TODO: add 020+68851 support
@@ -59,6 +61,7 @@ KernelMergeObject boot_platform_atari_m68k_other.o :
: -fno-pic #-Wa,--pcrel : -fno-pic #-Wa,--pcrel
; ;
KernelMergeObject boot_platform_atari_m68k.o : KernelMergeObject boot_platform_atari_m68k.o :
: : : :
boot_platform_atari_m68k_shell.o boot_platform_atari_m68k_shell.o
@@ -70,7 +73,9 @@ KernelMergeObject boot_platform_atari_m68k.o :
# the bootsector in haiku_loader must be checksummed # the bootsector in haiku_loader must be checksummed
rule ChecksumAtariLoader {
rule ChecksumAtariLoader
{
local haikuLoader = $(1) ; local haikuLoader = $(1) ;
local checksummer = <build>fixup_tos_boot_checksum ; local checksummer = <build>fixup_tos_boot_checksum ;
@@ -80,6 +85,7 @@ rule ChecksumAtariLoader {
} }
actions ChecksumAtariLoader bind TARGET_CHECKSUM { actions ChecksumAtariLoader bind TARGET_CHECKSUM {
$(TARGET_CHECKSUM) $(1) $(TARGET_CHECKSUM) $(1)
} }
@@ -90,6 +96,7 @@ ChecksumAtariLoader haiku_loader ;
# AUTO folder PRG target # AUTO folder PRG target
# based on KernelLd # based on KernelLd
rule AtariBootPrgLd rule AtariBootPrgLd
{ {
@@ -116,11 +123,13 @@ rule AtariBootPrgLd
} }
actions AtariBootPrgLd actions AtariBootPrgLd
{ {
$(LINK) $(LINKFLAGS) -o "$(1)" "$(2)" $(LINKLIBS) ; $(LINK) $(LINKFLAGS) -o "$(1)" "$(2)" $(LINKLIBS) ;
} }
AtariBootPrgLd haiku.prg : AtariBootPrgLd haiku.prg :
boot_loader_$(TARGET_BOOT_PLATFORM) boot_loader_$(TARGET_BOOT_PLATFORM)
: $(HAIKU_TOP)/src/system/ldscripts/$(TARGET_ARCH)/boot_prg_$(TARGET_BOOT_PLATFORM).ld : $(HAIKU_TOP)/src/system/ldscripts/$(TARGET_ARCH)/boot_prg_$(TARGET_BOOT_PLATFORM).ld