[haiku-commits] BRANCH xyzzy-github.x86_64 - src/add-ons/kernel/generic/bios/x86emu src/libs/x86emu src/add-ons/kernel/generic/bios/x86emu/x86emu headers/libs/x86emu/x86emu
- From: xyzzy-github.x86_64 <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 4 Aug 2012 11:49:18 +0200 (CEST)
added 3 changesets to branch 'refs/remotes/xyzzy-github/x86_64'
old head: 9bfe064799922abfaa9e139b8d59ce0a01914715
new head: 70ee5a7efb6b566d840437a24edf0264e4d6c2ee
----------------------------------------------------------------------------
54393c0: Merge branch 'master' into x86_64
92f09f1: Added AHCI driver to image.
70ee5a7: Moved x86emu to {src,headers}/libs/.
[ Alex Smith <alex@xxxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
133 files changed, 1009 insertions(+), 380 deletions(-)
build/jam/Haiku64Image | 4 +-
data/catalogs/add-ons/disk_systems/bfs/ru.catkeys | 6 +-
.../inbound_filters/match_header/zh-Hans.catkeys | 3 +-
.../outbound_protocols/smtp/zh-Hans.catkeys | 5 +-
.../media/media-add-ons/mixer/zh-Hans.catkeys | 18 +-
.../add-ons/screen_savers/glife/de.catkeys | 15 ++
.../add-ons/screen_savers/glife/fi.catkeys | 15 ++
.../add-ons/screen_savers/glife/ja.catkeys | 12 +
.../add-ons/screen_savers/glife/zh-Hans.catkeys | 9 +
.../add-ons/screen_savers/ifs/zh-Hans.catkeys | 4 +-
.../screen_savers/slideshowsaver/ru.catkeys | 2 +-
data/catalogs/add-ons/translators/png/ru.catkeys | 2 +-
data/catalogs/apps/aboutsystem/fi.catkeys | 4 +-
data/catalogs/apps/aboutsystem/ru.catkeys | 3 +-
data/catalogs/apps/activitymonitor/ru.catkeys | 2 +-
data/catalogs/apps/charactermap/ru.catkeys | 2 +-
data/catalogs/apps/deskbar/zh-Hans.catkeys | 14 +-
data/catalogs/apps/devices/ru.catkeys | 10 +-
data/catalogs/apps/diskusage/zh-Hans.catkeys | 3 +-
data/catalogs/apps/drivesetup/ru.catkeys | 4 +-
data/catalogs/apps/expander/zh-Hans.catkeys | 6 +-
data/catalogs/apps/icon-o-matic/ru.catkeys | 2 +-
data/catalogs/apps/icon-o-matic/zh-Hans.catkeys | 4 +-
data/catalogs/apps/installer/ru.catkeys | 18 +-
data/catalogs/apps/installer/zh-Hans.catkeys | 5 +-
data/catalogs/apps/launchbox/ru.catkeys | 6 +-
data/catalogs/apps/mail/ru.catkeys | 2 +-
data/catalogs/apps/mediaconverter/ru.catkeys | 14 +-
data/catalogs/apps/mediaplayer/ru.catkeys | 4 +-
data/catalogs/apps/mediaplayer/zh-Hans.catkeys | 10 +-
data/catalogs/apps/packageinstaller/ru.catkeys | 3 +-
data/catalogs/apps/people/ru.catkeys | 2 +-
data/catalogs/apps/powerstatus/ru.catkeys | 2 +-
data/catalogs/apps/soundrecorder/ru.catkeys | 6 +-
data/catalogs/apps/stylededit/ru.catkeys | 2 +-
data/catalogs/apps/sudoku/ru.catkeys | 6 +-
data/catalogs/apps/terminal/ru.catkeys | 2 +-
data/catalogs/apps/text_search/ru.catkeys | 2 +-
data/catalogs/apps/webpositive/de.catkeys | 126 +++++++++
data/catalogs/apps/webpositive/fi.catkeys | 126 +++++++++
data/catalogs/apps/webpositive/ja.catkeys | 43 +--
data/catalogs/apps/webpositive/ru.catkeys | 99 +++++++
data/catalogs/bin/desklink/ru.catkeys | 2 +-
data/catalogs/bin/dstcheck/ru.catkeys | 2 +-
data/catalogs/kits/bluetooth/ru.catkeys | 2 +-
data/catalogs/kits/tracker/be.catkeys | 3 +-
data/catalogs/kits/tracker/de.catkeys | 10 +-
data/catalogs/kits/tracker/el.catkeys | 3 +-
data/catalogs/kits/tracker/fi.catkeys | 10 +-
data/catalogs/kits/tracker/fr.catkeys | 3 +-
data/catalogs/kits/tracker/hi.catkeys | 3 +-
data/catalogs/kits/tracker/ja.catkeys | 5 +-
data/catalogs/kits/tracker/lt.catkeys | 3 +-
data/catalogs/kits/tracker/nb.catkeys | 3 +-
data/catalogs/kits/tracker/nl.catkeys | 3 +-
data/catalogs/kits/tracker/pl.catkeys | 3 +-
data/catalogs/kits/tracker/ro.catkeys | 3 +-
data/catalogs/kits/tracker/ru.catkeys | 7 +-
data/catalogs/kits/tracker/sk.catkeys | 3 +-
data/catalogs/kits/tracker/uk.catkeys | 3 +-
data/catalogs/kits/tracker/zh-Hans.catkeys | 9 +-
data/catalogs/preferences/appearance/de.catkeys | 3 +-
data/catalogs/preferences/appearance/fi.catkeys | 3 +-
.../preferences/appearance/zh-Hans.catkeys | 5 +-
data/catalogs/preferences/bluetooth/ru.catkeys | 2 +-
data/catalogs/preferences/filetypes/ru.catkeys | 2 +-
data/catalogs/preferences/keymap/ru.catkeys | 2 +-
data/catalogs/preferences/media/ru.catkeys | 2 +-
data/catalogs/preferences/notifications/ru.catkeys | 2 +-
data/catalogs/preferences/printers/ru.catkeys | 2 +-
data/catalogs/preferences/screen/ru.catkeys | 2 +-
data/catalogs/preferences/screensaver/ru.catkeys | 4 +-
data/catalogs/servers/mail/zh-Hans.catkeys | 5 +
.../tests/kits/opengl/glinfo/zh-Hans.catkeys | 5 +
headers/build/host/darwin/endian.h | 1 +
.../generic/bios => headers/libs}/x86emu/x86emu.h | 0
.../bios => headers/libs}/x86emu/x86emu/debug.h | 0
.../bios => headers/libs}/x86emu/x86emu/decode.h | 0
.../bios => headers/libs}/x86emu/x86emu/fpu.h | 0
.../bios => headers/libs}/x86emu/x86emu/fpu_regs.h | 0
.../bios => headers/libs}/x86emu/x86emu/ops.h | 0
.../bios => headers/libs}/x86emu/x86emu/prim_asm.h | 0
.../bios => headers/libs}/x86emu/x86emu/prim_ops.h | 0
.../libs}/x86emu/x86emu/prim_x86_gcc.h | 0
.../bios => headers/libs}/x86emu/x86emu/regs.h | 0
.../bios => headers/libs}/x86emu/x86emu/types.h | 0
.../bios => headers/libs}/x86emu/x86emu/x86emui.h | 0
headers/private/shared/ExpressionParser.h | 3 +-
.../devices/keyboard/TeamMonitorWindow.cpp | 216 ++++++++++------
.../devices/keyboard/TeamMonitorWindow.h | 4 +-
.../filters/shortcut_catcher/KeyCommandMap.cpp | 2 +
.../kernel/busses/scsi/ahci/ahci_controller.cpp | 20 +-
src/add-ons/kernel/busses/scsi/ahci/ahci_port.cpp | 65 ++---
src/add-ons/kernel/busses/scsi/ahci/util.cpp | 12 +-
.../kernel/drivers/graphics/radeon_hd/sensors.cpp | 4 +-
src/add-ons/kernel/generic/bios/Jamfile | 8 +-
src/apps/deskbar/BarMenuTitle.cpp | 2 +-
src/apps/deskbar/ExpandoMenuBar.cpp | 2 +-
src/apps/deskbar/TeamMenuItem.cpp | 6 +-
[ *** stats truncated: 34 lines dropped *** ]
############################################################################
Commit: 54393c0379e2b22f7863c3434eb2705b746575bb
Author: Alex Smith <alex@xxxxxxxxxxxxxxxx>
Date: Sat Aug 4 08:59:17 2012 UTC
Merge branch 'master' into x86_64
----------------------------------------------------------------------------
############################################################################
Commit: 92f09f1aebbed0b5a9a24925ff3edf2c5180e7ff
Author: Alex Smith <alex@xxxxxxxxxxxxxxxx>
Date: Sat Aug 4 09:14:22 2012 UTC
Added AHCI driver to image.
----------------------------------------------------------------------------
diff --git a/build/jam/Haiku64Image b/build/jam/Haiku64Image
index c841c23..7f4f1b0 100644
--- a/build/jam/Haiku64Image
+++ b/build/jam/Haiku64Image
@@ -60,6 +60,8 @@ if $(HAIKU_ATA_STACK) = 1 {
: generic_ide_pci ;
}
+AddFilesToHaikuImage system add-ons kernel busses scsi
+ : ahci ;
AddFilesToHaikuImage system add-ons kernel debugger
: <kdebug>demangle ;
AddFilesToHaikuImage system add-ons kernel file_systems
@@ -212,7 +214,7 @@ AddFilesToHaikuImage system : haiku_loader ;
# boot module links
AddBootModuleSymlinksToHaikuImage
$(ATA_ONLY)ata pci config_manager dpc scsi $(ATA_ONLY)ata_adapter
- locked_pool scsi_periph generic_ide_pci scsi_cd scsi_disk intel
+ locked_pool scsi_periph ahci generic_ide_pci scsi_cd scsi_disk intel
bfs
;
############################################################################
Commit: 70ee5a7efb6b566d840437a24edf0264e4d6c2ee
Author: Alex Smith <alex@xxxxxxxxxxxxxxxx>
Date: Sat Aug 4 09:21:22 2012 UTC
Moved x86emu to {src,headers}/libs/.
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/generic/bios/x86emu/x86emu.h
b/headers/libs/x86emu/x86emu.h
similarity index 100%
rename from src/add-ons/kernel/generic/bios/x86emu/x86emu.h
rename to headers/libs/x86emu/x86emu.h
diff --git a/src/add-ons/kernel/generic/bios/x86emu/x86emu/debug.h
b/headers/libs/x86emu/x86emu/debug.h
similarity index 100%
rename from src/add-ons/kernel/generic/bios/x86emu/x86emu/debug.h
rename to headers/libs/x86emu/x86emu/debug.h
diff --git a/src/add-ons/kernel/generic/bios/x86emu/x86emu/decode.h
b/headers/libs/x86emu/x86emu/decode.h
similarity index 100%
rename from src/add-ons/kernel/generic/bios/x86emu/x86emu/decode.h
rename to headers/libs/x86emu/x86emu/decode.h
diff --git a/src/add-ons/kernel/generic/bios/x86emu/x86emu/fpu.h
b/headers/libs/x86emu/x86emu/fpu.h
similarity index 100%
rename from src/add-ons/kernel/generic/bios/x86emu/x86emu/fpu.h
rename to headers/libs/x86emu/x86emu/fpu.h
diff --git a/src/add-ons/kernel/generic/bios/x86emu/x86emu/fpu_regs.h
b/headers/libs/x86emu/x86emu/fpu_regs.h
similarity index 100%
rename from src/add-ons/kernel/generic/bios/x86emu/x86emu/fpu_regs.h
rename to headers/libs/x86emu/x86emu/fpu_regs.h
diff --git a/src/add-ons/kernel/generic/bios/x86emu/x86emu/ops.h
b/headers/libs/x86emu/x86emu/ops.h
similarity index 100%
rename from src/add-ons/kernel/generic/bios/x86emu/x86emu/ops.h
rename to headers/libs/x86emu/x86emu/ops.h
diff --git a/src/add-ons/kernel/generic/bios/x86emu/x86emu/prim_asm.h
b/headers/libs/x86emu/x86emu/prim_asm.h
similarity index 100%
rename from src/add-ons/kernel/generic/bios/x86emu/x86emu/prim_asm.h
rename to headers/libs/x86emu/x86emu/prim_asm.h
diff --git a/src/add-ons/kernel/generic/bios/x86emu/x86emu/prim_ops.h
b/headers/libs/x86emu/x86emu/prim_ops.h
similarity index 100%
rename from src/add-ons/kernel/generic/bios/x86emu/x86emu/prim_ops.h
rename to headers/libs/x86emu/x86emu/prim_ops.h
diff --git a/src/add-ons/kernel/generic/bios/x86emu/x86emu/prim_x86_gcc.h
b/headers/libs/x86emu/x86emu/prim_x86_gcc.h
similarity index 100%
rename from src/add-ons/kernel/generic/bios/x86emu/x86emu/prim_x86_gcc.h
rename to headers/libs/x86emu/x86emu/prim_x86_gcc.h
diff --git a/src/add-ons/kernel/generic/bios/x86emu/x86emu/regs.h
b/headers/libs/x86emu/x86emu/regs.h
similarity index 100%
rename from src/add-ons/kernel/generic/bios/x86emu/x86emu/regs.h
rename to headers/libs/x86emu/x86emu/regs.h
diff --git a/src/add-ons/kernel/generic/bios/x86emu/x86emu/types.h
b/headers/libs/x86emu/x86emu/types.h
similarity index 100%
rename from src/add-ons/kernel/generic/bios/x86emu/x86emu/types.h
rename to headers/libs/x86emu/x86emu/types.h
diff --git a/src/add-ons/kernel/generic/bios/x86emu/x86emu/x86emui.h
b/headers/libs/x86emu/x86emu/x86emui.h
similarity index 100%
rename from src/add-ons/kernel/generic/bios/x86emu/x86emu/x86emui.h
rename to headers/libs/x86emu/x86emu/x86emui.h
diff --git a/src/add-ons/kernel/generic/bios/Jamfile
b/src/add-ons/kernel/generic/bios/Jamfile
index faa5ec4..cab1336 100644
--- a/src/add-ons/kernel/generic/bios/Jamfile
+++ b/src/add-ons/kernel/generic/bios/Jamfile
@@ -1,17 +1,23 @@
SubDir HAIKU_TOP src add-ons kernel generic bios ;
+UseHeaders [ LibraryHeaders x86emu ] ;
UsePrivateKernelHeaders ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) x86emu ] ;
-KernelAddon bios :
+local x86emuSources =
decode.c
fpu.c
ops.c
ops2.c
prim_ops.c
sys.c
+;
+KernelAddon bios :
+ $(x86emuSources)
bios.cpp
;
+SEARCH on [ FGristFiles $(x86emuSources) ]
+ = [ FDirName $(HAIKU_TOP) src libs x86emu ] ;
diff --git a/src/add-ons/kernel/generic/bios/x86emu/debug.c
b/src/libs/x86emu/debug.c
similarity index 100%
rename from src/add-ons/kernel/generic/bios/x86emu/debug.c
rename to src/libs/x86emu/debug.c
diff --git a/src/add-ons/kernel/generic/bios/x86emu/decode.c
b/src/libs/x86emu/decode.c
similarity index 100%
rename from src/add-ons/kernel/generic/bios/x86emu/decode.c
rename to src/libs/x86emu/decode.c
diff --git a/src/add-ons/kernel/generic/bios/x86emu/fpu.c
b/src/libs/x86emu/fpu.c
similarity index 100%
rename from src/add-ons/kernel/generic/bios/x86emu/fpu.c
rename to src/libs/x86emu/fpu.c
diff --git a/src/add-ons/kernel/generic/bios/x86emu/ops.c
b/src/libs/x86emu/ops.c
similarity index 100%
rename from src/add-ons/kernel/generic/bios/x86emu/ops.c
rename to src/libs/x86emu/ops.c
diff --git a/src/add-ons/kernel/generic/bios/x86emu/ops2.c
b/src/libs/x86emu/ops2.c
similarity index 100%
rename from src/add-ons/kernel/generic/bios/x86emu/ops2.c
rename to src/libs/x86emu/ops2.c
diff --git a/src/add-ons/kernel/generic/bios/x86emu/prim_ops.c
b/src/libs/x86emu/prim_ops.c
similarity index 100%
rename from src/add-ons/kernel/generic/bios/x86emu/prim_ops.c
rename to src/libs/x86emu/prim_ops.c
diff --git a/src/add-ons/kernel/generic/bios/x86emu/sys.c
b/src/libs/x86emu/sys.c
similarity index 100%
rename from src/add-ons/kernel/generic/bios/x86emu/sys.c
rename to src/libs/x86emu/sys.c
diff --git a/src/add-ons/kernel/generic/bios/x86emu/validate.c
b/src/libs/x86emu/validate.c
similarity index 100%
rename from src/add-ons/kernel/generic/bios/x86emu/validate.c
rename to src/libs/x86emu/validate.c
Other related posts:
- » [haiku-commits] BRANCH xyzzy-github.x86_64 - src/add-ons/kernel/generic/bios/x86emu src/libs/x86emu src/add-ons/kernel/generic/bios/x86emu/x86emu headers/libs/x86emu/x86emu - xyzzy-github . x86_64
