[haiku-commits] r38941 - in haiku/trunk/src/system/boot/platform: amiga_m68k atari_m68k

  • From: revol@xxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 10 Oct 2010 22:18:07 +0200 (CEST)

Author: mmu_man
Date: 2010-10-10 22:18:07 +0200 (Sun, 10 Oct 2010)
New Revision: 38941
Changeset: http://dev.haiku-os.org/changeset/38941

Modified:
   haiku/trunk/src/system/boot/platform/amiga_m68k/Jamfile
   haiku/trunk/src/system/boot/platform/amiga_m68k/amicalls.cpp
   haiku/trunk/src/system/boot/platform/atari_m68k/Jamfile
Log:
The Coding Style Police is much more efficient than the HADOPI...


Modified: haiku/trunk/src/system/boot/platform/amiga_m68k/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/platform/amiga_m68k/Jamfile     2010-10-10 
18:33:00 UTC (rev 38940)
+++ haiku/trunk/src/system/boot/platform/amiga_m68k/Jamfile     2010-10-10 
20:18:07 UTC (rev 38941)
@@ -19,6 +19,7 @@
 
 #SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons accelerants common ] ;
 
+
 KernelMergeObject boot_platform_amiga_m68k_shell.o :
        shell.S
        : -Wa,--pcrel
@@ -55,6 +56,7 @@
        : -fno-pic #-Wa,--pcrel
 ;
 
+
 KernelMergeObject boot_platform_amiga_m68k.o :
        : :
        boot_platform_amiga_m68k_shell.o
@@ -63,9 +65,10 @@
        boot_arch_m68k_040.o
 ;
 
+
 # the bootsector in haiku_loader must be checksummed
-
-rule ChecksumAmigaLoader {
+rule ChecksumAmigaLoader
+{
        local haikuLoader = $(1) ;
        local checksummer = <build>fixup_amiga_boot_checksum ;
 
@@ -75,7 +78,9 @@
 
 }
 
-actions ChecksumAmigaLoader bind TARGET_CHECKSUM {
+
+actions ChecksumAmigaLoader bind TARGET_CHECKSUM
+{
        $(TARGET_CHECKSUM) $(1)
 }
 

Modified: haiku/trunk/src/system/boot/platform/amiga_m68k/amicalls.cpp
===================================================================
--- haiku/trunk/src/system/boot/platform/amiga_m68k/amicalls.cpp        
2010-10-10 18:33:00 UTC (rev 38940)
+++ haiku/trunk/src/system/boot/platform/amiga_m68k/amicalls.cpp        
2010-10-10 20:18:07 UTC (rev 38941)
@@ -21,15 +21,22 @@
 exec_error(int32 err)
 {
        switch (err) {
-       case IOERR_OPENFAIL:    return B_DEV_BAD_DRIVE_NUM;
-       case IOERR_ABORTED:             return EINTR;
-       case IOERR_NOCMD:               return EINVAL;
-       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:
-               return B_ERROR;
+               case IOERR_OPENFAIL:
+                       return B_DEV_BAD_DRIVE_NUM;
+               case IOERR_ABORTED:
+                       return EINTR;
+               case IOERR_NOCMD:
+                       return EINVAL;
+               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:
+                       return B_ERROR;
        }
 }
 

Modified: haiku/trunk/src/system/boot/platform/atari_m68k/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/platform/atari_m68k/Jamfile     2010-10-10 
18:33:00 UTC (rev 38940)
+++ haiku/trunk/src/system/boot/platform/atari_m68k/Jamfile     2010-10-10 
20:18:07 UTC (rev 38941)
@@ -19,11 +19,13 @@
 
 #SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons accelerants common ] ;
 
+
 KernelMergeObject boot_platform_atari_m68k_shell.o :
        shell.S
        : -Wa,--pcrel
 ;
 
+
 # cpu-specific stuff
 # should be moved to boot/arch/m68k/...
 # TODO: add 020+68851 support
@@ -59,6 +61,7 @@
        : -fno-pic #-Wa,--pcrel
 ;
 
+
 KernelMergeObject boot_platform_atari_m68k.o :
        : :
        boot_platform_atari_m68k_shell.o
@@ -70,7 +73,9 @@
 
 # the bootsector in haiku_loader must be checksummed
 
-rule ChecksumAtariLoader {
+
+rule ChecksumAtariLoader
+{
        local haikuLoader = $(1) ;
        local checksummer = <build>fixup_tos_boot_checksum ;
 
@@ -80,6 +85,7 @@
 
 }
 
+
 actions ChecksumAtariLoader bind TARGET_CHECKSUM {
        $(TARGET_CHECKSUM) $(1)
 }
@@ -90,6 +96,7 @@
 
 # AUTO folder PRG target
 
+
 # based on KernelLd
 rule AtariBootPrgLd
 {
@@ -116,11 +123,13 @@
 
 }
 
+
 actions AtariBootPrgLd
 {
        $(LINK) $(LINKFLAGS) -o "$(1)" "$(2)" $(LINKLIBS) ;
 }
 
+
 AtariBootPrgLd haiku.prg :
        boot_loader_$(TARGET_BOOT_PLATFORM)
        : 
$(HAIKU_TOP)/src/system/ldscripts/$(TARGET_ARCH)/boot_prg_$(TARGET_BOOT_PLATFORM).ld


Other related posts: