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

* Renamed nv.driver to "nvidia", nm.driver to "neomagic", and mga.driver to "matrox";

Browse Source 
also renamed their accelerants and settings files accordingly.
* Added Mandelbrot and GLDirectMode as demo applications.
* Moved CortexAddOnHost to /bin.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21010 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2007-05-04 07:49:53 +00:00
parent 122723c33b
commit a5667a5b8b
18 changed files with 412 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+7 -6
View File
@@ -22,6 +22,7 @@ if $(INCLUDE_GPL_ADDONS) = 1 {
BEOS_BIN = "[" addattr alert arp basename bc beep bzip2 cat cardctl catattr chgrp
chmod chop chown cksum clear clockconfig cmp comm compress cp copyattr
$(X86_ONLY)CortexAddOnHost
csplit ctags cut date dc dd desklink df diff diff3 dircolors dirname
driveinfo dstcheck du dump_cis dump_cisreg echo eject env error expand
expr factor false fdinfo ffm find finddir fmt fold fortune frcode ftp funzip gawk
@@ -44,7 +45,7 @@ BEOS_BIN = "[" addattr alert arp basename bc beep bzip2 cat cardctl catattr chgr
BEOS_APPS = Terminal Expander People ShowImage Pulse ProcessController
SoundRecorder Magnify DiskProbe AboutHaiku StyledEdit Installer Workspaces
$(X86_ONLY)Cortex $(X86_ONLY)CortexAddOnHost MediaPlayer DeskCalc MidiPlayer
$(X86_ONLY)Cortex MediaPlayer DeskCalc MidiPlayer
Icon-O-Matic Mail CDPlayer NetworkStatus TV
;
BEOS_PREFERENCES = Appearance Backgrounds DataTranslations E-mail FileTypes
@@ -52,7 +53,7 @@ BEOS_PREFERENCES = Appearance Backgrounds DataTranslations E-mail FileTypes
Time VirtualMemory
;
BEOS_DEMOS = BitmapDrawing Chart Clock FontDemo $(X86_ONLY)GLTeapot PictureTest
Playground
Playground Mandelbrot GLDirectMode
;
BEOS_SYSTEM_LIB = libbe.so $(HAIKU_LIBSTDC++) libmedia.so libtracker.so
libtranslation.so libnetwork.so libdebug.so libbsd.so libmail.so
@@ -70,8 +71,8 @@ BEOS_NETWORK_DATALINK_PROTOCOLS = ethernet_frame <module>arp loopback_frame ipv4
#BEOS_NETWORK_PPP = ipcp modem pap pppoe ;
BEOS_NETWORK_PROTOCOLS = ipv4 tcp udp icmp ;
BEOS_ADD_ONS_ACCELERANTS = $(X86_ONLY)radeon.accelerant $(X86_ONLY)nv.accelerant
$(X86_ONLY)mga.accelerant $(X86_ONLY)nm.accelerant
BEOS_ADD_ONS_ACCELERANTS = $(X86_ONLY)radeon.accelerant $(X86_ONLY)nvidia.accelerant
$(X86_ONLY)matrox.accelerant $(X86_ONLY)neomagic.accelerant
$(X86_ONLY)intel_extreme.accelerant vesa.accelerant
#$(X86_ONLY)vmware.accelerant
;
@@ -103,8 +104,8 @@ BEOS_ADD_ONS_PRINT_TRANSPORT = HP\ JetDirect IPP LPR Parallel\ Port
;
BEOS_ADD_ONS_SCREENSAVERS = Haiku IFS ;
BEOS_ADD_ONS_DRIVERS_AUDIO = auich auvia emuxki ;
BEOS_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon.driver $(X86_ONLY)nv.driver
$(X86_ONLY)nm.driver $(X86_ONLY)mga.driver $(X86_ONLY)intel_extreme vesa
BEOS_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon $(X86_ONLY)nvidia
$(X86_ONLY)neomagic $(X86_ONLY)matrox $(X86_ONLY)intel_extreme vesa
#$(X86_ONLY)vmware
;
BEOS_ADD_ONS_DRIVERS_MIDI = emuxki ;
headers/private/graphics/matrox/DriverInterface.h
+1 -1
View File
@@ -17,7 +17,7 @@
#include <PCI.h>
#include <OS.h>
#define DRIVER_PREFIX "mga" // apsed
#define DRIVER_PREFIX "matrox" // apsed
#define DEVICE_FORMAT "%04x_%04x_%02x%02x%02x" // apsed
/*
headers/private/graphics/neomagic/DriverInterface.h
+1 -1
View File
@@ -15,7 +15,7 @@
#include <PCI.h>
#include <OS.h>
#define DRIVER_PREFIX "nm" // apsed
#define DRIVER_PREFIX "neomagic"
/*
Internal driver state (also for sharing info between driver and accelerant)
headers/private/graphics/nvidia/DriverInterface.h
+1 -1
View File
@@ -18,7 +18,7 @@
#include <OS.h>
#include "AGP.h"
#define DRIVER_PREFIX "nv" // apsed
#define DRIVER_PREFIX "nvidia" // apsed
#define DEVICE_FORMAT "%04x_%04x_%02x%02x%02x" // apsed
/*
src/add-ons/accelerants/matrox/Jamfile
+3 -3
View File
@@ -6,7 +6,7 @@ UsePrivateHeaders graphics ;
UsePrivateHeaders [ FDirName graphics matrox ] ;
UseHeaders [ FDirName $(SUBDIR) engine ] ;
Addon mga.accelerant :
Addon matrox.accelerant :
Cursor.c
EngineManagment.c
GetAccelerantHook.c
@@ -21,9 +21,9 @@ Addon mga.accelerant :
;
Package haiku-matrox-cvs :
mga.accelerant :
matrox.accelerant :
boot home config add-ons accelerants ;
Depends mga.accelerant : mga.driver ;
Depends matrox.accelerant : matrox ;
SubInclude HAIKU_TOP src add-ons accelerants matrox engine ;
src/add-ons/accelerants/matrox/Overlay.c
+2 -2
View File
@@ -238,7 +238,7 @@ const overlay_buffer *ALLOCATE_OVERLAY_BUFFER(color_space cs, uint16 width, uint
/* NOTE to app programmers:
* For testing app behaviour regarding workspace switches or screen prefs changes to settings
* that do not have enough cardRAM left for allocation of overlay bitmaps, you need a card with
* a low amount of RAM. Or you can set in the file mga.settings for example:
* a low amount of RAM. Or you can set in the file matrox.settings for example:
* memory 8 #8Mb RAM on card
* and reboot (this simulates 8Mb RAM on the card).
*
@@ -332,7 +332,7 @@ const overlay_buffer *ALLOCATE_OVERLAY_BUFFER(color_space cs, uint16 width, uint
/* NOTE to app programmers:
* For testing app behaviour regarding workspace switches or screen prefs changes to settings
* that do not have enough cardRAM left for allocation of overlay bitmaps, you need a card with
* a low amount of RAM. Or you can set in the file mga.settings for example:
* a low amount of RAM. Or you can set in the file matrox.settings for example:
* memory 8 #8Mb RAM on card
* and reboot (this simulates 8Mb RAM on the card).
*
src/add-ons/accelerants/neomagic/Jamfile
+3 -3
View File
@@ -6,7 +6,7 @@ UsePrivateHeaders graphics ;
UsePrivateHeaders [ FDirName graphics neomagic ] ;
UseHeaders [ FDirName $(SUBDIR) engine ] ;
Addon nm.accelerant :
Addon neomagic.accelerant :
Acceleration.c
Cursor.c
EngineManagment.c
@@ -22,9 +22,9 @@ Addon nm.accelerant :
;
Package haiku-neomagic-cvs :
nm.accelerant :
neomagic.accelerant :
boot home config add-ons accelerants ;
Depends nm.accelerant : nm.driver ;
Depends neomagic.accelerant : neomagic ;
SubInclude HAIKU_TOP src add-ons accelerants neomagic engine ;
src/add-ons/accelerants/nvidia/Jamfile
+3 -3
View File
@@ -6,7 +6,7 @@ UsePrivateHeaders graphics ;
UsePrivateHeaders [ FDirName graphics nvidia ] ;
UseHeaders [ FDirName $(SUBDIR) engine ] ;
Addon nv.accelerant :
Addon nvidia.accelerant :
Acceleration.c
Cursor.c
EngineManagment.c
@@ -22,9 +22,9 @@ Addon nv.accelerant :
;
Package haiku-nvidia-cvs :
nv.accelerant :
nvidia.accelerant :
boot home config add-ons accelerants ;
Depends nv.accelerant : nv.driver ;
Depends nvidia.accelerant : nvidia ;
SubInclude HAIKU_TOP src add-ons accelerants nvidia engine ;
src/add-ons/accelerants/radeon/Jamfile
+1 -1
View File
@@ -40,4 +40,4 @@ Package haiku-radeon-cvs :
radeon.accelerant :
boot home config add-ons accelerants ;
Depends radeon.accelerant : radeon.driver ;
Depends radeon.accelerant : radeon ;
src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp
+1 -1
View File
@@ -42,7 +42,7 @@ const struct supported_device {
{0x2572, INTEL_TYPE_8xx | INTEL_TYPE_85x, "i865G"},
{0x3582, INTEL_TYPE_8xx | INTEL_TYPE_85x, "i855G"},
#if 0
#if 1
{0x2792, INTEL_TYPE_9xx, "i910"},
{0x258a, INTEL_TYPE_9xx, "i915"},
{0x2582, INTEL_TYPE_9xx, "i915G"},
src/add-ons/kernel/drivers/graphics/matrox/Jamfile
+4 -5
View File
@@ -5,17 +5,16 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders graphics ;
UsePrivateHeaders [ FDirName graphics matrox ] ;
KernelAddon mga.driver :
KernelAddon matrox :
driver.c
;
Package haiku-matrox-cvs :
README.html UPDATE.html ;
Package haiku-matrox-cvs :
mga.driver :
matrox :
boot home config add-ons kernel drivers bin ;
PackageDriverSymLink haiku-matrox-cvs : graphics mga.driver ;
PackageDriverSymLink haiku-matrox-cvs : graphics matrox ;
Package haiku-matrox-cvs :
mga.settings :
matrox.settings :
boot home config settings kernel drivers ;
src/add-ons/kernel/drivers/graphics/matrox/mga.settings → src/add-ons/kernel/drivers/graphics/matrox/matrox.settings
View File
src/add-ons/kernel/drivers/graphics/neomagic/Jamfile
+4 -4
View File
@@ -5,17 +5,17 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders graphics ;
UsePrivateHeaders [ FDirName graphics neomagic ] ;
KernelAddon nm.driver :
KernelAddon neomagic :
driver.c
;
Package haiku-neomagic-cvs :
README.html UPDATE.html ;
Package haiku-neomagic-cvs :
nm.driver :
neomagic :
boot home config add-ons kernel drivers bin ;
PackageDriverSymLink haiku-neomagic-cvs : graphics nm.driver ;
PackageDriverSymLink haiku-neomagic-cvs : graphics neomagic ;
Package haiku-neomagic-cvs :
nm.settings :
neomagic.settings :
boot home config settings kernel drivers ;
src/add-ons/kernel/drivers/graphics/neomagic/nm.settings → src/add-ons/kernel/drivers/graphics/neomagic/neomagic.settings
+4 -4
View File
@@ -1,11 +1,11 @@
# Settings file for the nm driver and accelerant
# Settings file for the neomagic driver and accelerant
#
# This file should be moved to the directory
# ~/config/settings/kernel/drivers/
#
# nm.driver parameters
# accelerant "nm.accelerant"
# neomagic parameters
# accelerant "neomagic.accelerant"
# nm.accelerant parameters
usebios true # if true rely on bios to coldstart the card instead of driver (not functional)
@@ -16,7 +16,7 @@ hardcursor true # if true use on-chip cursor capabilities
#logmask 0x80000000 # log following mask
#logmask 0x08000604 # log overlay use in full
#logmask 0xffffffff # log everything
dumprom false # dump bios rom in ~/nm.rom
dumprom false # dump bios rom in ~/neomagic.rom
#--------- that's all.
src/add-ons/kernel/drivers/graphics/nvidia/Jamfile
+4 -4
View File
@@ -5,17 +5,17 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders graphics ;
UsePrivateHeaders [ FDirName graphics nvidia ] ;
KernelAddon nv.driver :
KernelAddon nvidia :
driver.c
;
Package haiku-nvidia-cvs :
README.html UPDATE.html ;
Package haiku-nvidia-cvs :
nv.driver :
nvidia :
boot home config add-ons kernel drivers bin ;
PackageDriverSymLink haiku-nvidia-cvs : graphics nv.driver ;
PackageDriverSymLink haiku-nvidia-cvs : graphics nvidia ;
Package haiku-nvidia-cvs :
nv.settings :
nvidia.settings :
boot home config settings kernel drivers ;
src/add-ons/kernel/drivers/graphics/nvidia/driver.c
+370 -305
View File
File diff suppressed because it is too large Load Diff
src/add-ons/kernel/drivers/graphics/nvidia/nv.settings → src/add-ons/kernel/drivers/graphics/nvidia/nvidia.settings
View File
src/add-ons/kernel/drivers/graphics/radeon/Jamfile
+3 -3
View File
@@ -11,7 +11,7 @@ StaticLibrary libradeon.a :
utils.c
;
KernelAddon radeon.driver :
KernelAddon radeon :
driver.c
agp.c
bios.c
@@ -30,9 +30,9 @@ KernelAddon radeon.driver :
#Package haiku-radeon-cvs :
# README.html UPDATE.html ;
Package haiku-radeon-cvs :
radeon.driver :
radeon :
boot home config add-ons kernel drivers bin ;
PackageDriverSymLink haiku-radeon-cvs : graphics radeon.driver ;
PackageDriverSymLink haiku-radeon-cvs : graphics radeon ;
#Package haiku-radeon-cvs :
# radeon.settings :
# boot home config settings kernel drivers ;