Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 30357: Change back some wrongly changed strings
by cfinck＠svn.reactos.org 11 Nov '07

11 Nov '07

Author: cfinck Date: Sun Nov 11 18:20:55 2007 New Revision: 30357 URL: http://svn.reactos.org/svn/reactos?rev=30357&view=rev Log: Change back some wrongly changed strings Modified: trunk/web/reactos.org/htdocs/getbuilds/lang/fr.inc.php Modified: trunk/web/reactos.org/htdocs/getbuilds/lang/fr.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/l… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/lang/fr.inc.php (original) +++ trunk/web/reactos.org/htdocs/getbuilds/lang/fr.inc.php Sun Nov 11 18:20:55 2007 @@ -25,15 +25,15 @@ $getbuilds_langres["downloadrev"] = "TÃ©lÃ©charger les binaires d'une rÃ©vision de ReactOS"; $getbuilds_langres["js_disclaimer"] = 'JavaScript a besoin d\'Ãªtre activÃ© dans votre navigateur pour utiliser la liste des fichiers de rÃ©vision.<br>Autrement, vous pouvez tÃ©lÃ©charger tous les binaires des rÃ©visions <a href="http://svn.reactos.org/iso">ici</a>.'; - $getbuilds_langres["showrevfiles"] = "Montrer les fichiers de la rÃ©vision"; + $getbuilds_langres["showrevfiles"] = "Montrer les fichiers de la rÃ©vision "; $getbuilds_langres["prevrev"] = "RÃ©vision prÃ©cÃ©dente"; $getbuilds_langres["nextrev"] = "RÃ©vision suivante"; $getbuilds_langres["showrev"] = "Montrer"; $getbuilds_langres["gettinglist"] = "RÃ©cupÃ©ration de la liste des fichiers"; $getbuilds_langres["rangeinfo"] = "Vous pouvez entrer un numÃ©ro de rÃ©vision (p.e. %s) ou un intervalle de rÃ©visions (p.e. %s-%s)"; - $getbuilds_langres["isotype"] = "Montrer les types d\'images de CD"; + $getbuilds_langres["isotype"] = "Montrer les types d\'images de CD "; - $getbuilds_langres["foundfiles"] = "%s fichiers trouvÃ©s!"; + $getbuilds_langres["foundfiles"] = "%s fichiers trouvÃ©s !"; $getbuilds_langres["firstpage_title"] = "Aller Ã la premiÃ¨re page"; $getbuilds_langres["prevpage_title"] = "Page prÃ©cÃ©dente"; @@ -48,8 +48,8 @@ $getbuilds_langres["filedate"] = "Derniers changements"; $getbuilds_langres["pleasewait"] = "Veuillez patienter"; - $getbuilds_langres["nofiles"] = "Il n\'y a pas de fichiers disponibles pour la rÃ©vision %s!"; - $getbuilds_langres["invalidrev"] = "NumÃ©ro de rÃ©vision invalide!"; + $getbuilds_langres["nofiles"] = "Il n\'y a pas de fichiers disponibles pour la rÃ©vision %s !"; + $getbuilds_langres["invalidrev"] = "NumÃ©ro de rÃ©vision invalide !"; - $getbuilds_langres["rangelimitexceeded"] = "L\'intervalle de rÃ©visions ne peut contenir qu\'un maximum de %s rÃ©visions!"; + $getbuilds_langres["rangelimitexceeded"] = "L\'intervalle de rÃ©visions ne peut contenir qu\'un maximum de %s rÃ©visions !"; ?>

1 0

[cfinck] 30356: - Fix the french translation Some strings using apostrophes need an additional backslash before each apostrophe, even if they are in double quotation marks, because they are later inserted in JavaScript strings with single quotation marks - Move the french translation up in the languages listbox, please keep the alphabetical order :-) - Set svn:eol-style "native" for the getbuilds stuff
by cfinck＠svn.reactos.org 11 Nov '07

11 Nov '07

1 0

[pschweitzer] 30355: French translation for getbuilds
by pschweitzer＠svn.reactos.org 11 Nov '07

11 Nov '07

Author: pschweitzer Date: Sun Nov 11 15:45:21 2007 New Revision: 30355 URL: http://svn.reactos.org/svn/reactos?rev=30355&view=rev Log: French translation for getbuilds Added: trunk/web/reactos.org/htdocs/getbuilds/lang/fr.inc.php Modified: trunk/web/reactos.org/htdocs/getbuilds/languages.inc.php Added: trunk/web/reactos.org/htdocs/getbuilds/lang/fr.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/l… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/lang/fr.inc.php (added) +++ trunk/web/reactos.org/htdocs/getbuilds/lang/fr.inc.php Sun Nov 11 15:45:21 2007 @@ -1,0 +1,55 @@ +<?php +/* + PROJECT: ReactOS Website + LICENSE: GPL v2 or any later version + FILE: web/reactos.org/htdocs/getbuilds/lang/fr.inc.php + PURPOSE: Easily download prebuilt ReactOS Revisions + COPYRIGHT: Copyright 2007 Colin Finck <mail(a)colinfinck.de> + TRANSLATOR: Pierre Schweitzer <heis_spiter(a)hotmail.com> +*/ + + /**** French resources (charset=utf-8) ****/ + $getbuilds_langres["language"] = "Langue"; + + $getbuilds_langres["header"] = '<a href="http://www.reactos.org/">Accueil</a> > Binaires du tronc de ReactOS'; + $getbuilds_langres["title"] = "TÃ©lÃ©charger les binaires du tronc de ReactOS"; + $getbuilds_langres["intro"] = 'Ici vous pouvez tÃ©lÃ©charger les rÃ©centes binaires, mais aussi les plus anciennes version de ReactOS, qui ont Ã©tÃ© crÃ©Ã©es par notre <a href="http://www.reactos.org/wiki/index.php/RosBuild">BuildBot</a>.'; + + $getbuilds_langres["overview"] = "AperÃ§u"; + $getbuilds_langres["latestrev"] = "DerniÃ¨re rÃ©vision de ReactOS sur le serveur SVN"; + $getbuilds_langres["browsesvn"] = "Parcourir le rÃ©pertoire SVN en ligne"; + $getbuilds_langres["cia"] = "Voir les derniers commits sur CIA.vc"; + $getbuilds_langres["buildbot_status"] = "Statut du robot BuildBot"; + $getbuilds_langres["buildbot_web"] = "View details at the BuildBot Web Interface"; + $getbuilds_langres["browsebuilds"] = "Parcourir toutes les binaires crÃ©Ã©es"; + + $getbuilds_langres["downloadrev"] = "TÃ©lÃ©charger les binaires d'une rÃ©vision de ReactOS"; + $getbuilds_langres["js_disclaimer"] = 'JavaScript a besoin d\'Ãªtre activÃ© dans votre navigateur pour utiliser la liste des fichiers de rÃ©vision.<br>Autrement, vous pouvez tÃ©lÃ©charger tous les binaires des rÃ©visions <a href="http://svn.reactos.org/iso">ici</a>.'; + $getbuilds_langres["showrevfiles"] = "Montrer les fichiers de la rÃ©vision "; + $getbuilds_langres["prevrev"] = "RÃ©vision prÃ©cÃ©dente"; + $getbuilds_langres["nextrev"] = "RÃ©vision suivante"; + $getbuilds_langres["showrev"] = "Montrer"; + $getbuilds_langres["gettinglist"] = "RÃ©cupÃ©ration de la liste des fichiers"; + $getbuilds_langres["rangeinfo"] = "Vous pouvez entrer un numÃ©ro de rÃ©vision (p.e. %s) ou un intervalle de rÃ©visions (p.e. %s-%s)"; + $getbuilds_langres["isotype"] = "Montrer les types d'images de CD "; + + $getbuilds_langres["foundfiles"] = "%s fichiers trouvÃ©s !"; + + $getbuilds_langres["firstpage_title"] = "Aller Ã la premiÃ¨re page"; + $getbuilds_langres["prevpage_title"] = "Page prÃ©cÃ©dente"; + $getbuilds_langres["prevpage"] = "PrÃ©cÃ©dente"; + $getbuilds_langres["page"] = "Page"; + $getbuilds_langres["nextpage"] = "Suivante"; + $getbuilds_langres["nextpage_title"] = "Page suivante"; + $getbuilds_langres["lastpage_title"] = "Aller Ã la derniÃ¨re page"; + + $getbuilds_langres["filename"] = "Nom du fichier"; + $getbuilds_langres["filesize"] = "Taille"; + $getbuilds_langres["filedate"] = "Derniers changements"; + $getbuilds_langres["pleasewait"] = "Veuillez patienter"; + + $getbuilds_langres["nofiles"] = "Il n'y a pas de fichiers disponibles pour la rÃ©vision %s !"; + $getbuilds_langres["invalidrev"] = "NumÃ©ro de rÃ©vision invalide !"; + + $getbuilds_langres["rangelimitexceeded"] = "L'intervalle de rÃ©visions ne peut contenir qu'un maximum de %s rÃ©visions !"; +?> Modified: trunk/web/reactos.org/htdocs/getbuilds/languages.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/l… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/languages.inc.php (original) +++ trunk/web/reactos.org/htdocs/getbuilds/languages.inc.php Sun Nov 11 15:45:21 2007 @@ -13,6 +13,7 @@ "de" => "Deutsch (German)", "es" => "EspaÃ±ol (Spanish)", "it" => "Italiano (Italian)", - "lt" => "LietuviÅ³ (Lithuanian)" + "lt" => "LietuviÅ³ (Lithuanian)", + "fr" => "FranÃ§ais (French)" ); ?>

1 0

[arty] 30354: Debug devtree. Add generation of simple device tree in freeldr.
by arty＠svn.reactos.org 11 Nov '07

11 Nov '07

Author: arty Date: Sun Nov 11 14:14:52 2007 New Revision: 30354 URL: http://svn.reactos.org/svn/reactos?rev=30354&view=rev Log: Debug devtree. Add generation of simple device tree in freeldr. Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep_pci.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep_vga.c trunk/reactos/lib/lib.rbuild trunk/reactos/lib/ppcdevtree/devtree.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Sun Nov 11 14:14:52 2007 @@ -474,10 +474,71 @@ //printf("RTCGeturrentDateTime\n"); } +/* Recursively copy the device tree into our representation + * It'll be passed to HAL. + * + * When NT was first done on PPC, it was on PReP hardware, which is very + * like PC hardware (really, just a PPC on a PC motherboard). HAL can guess + * the addresses of needed resources in this scheme as it can on x86. + * + * Most PPC hardware doesn't assign fixed addresses to hardware, which is + * the problem that open firmware partially solves. It allows hardware makers + * much more leeway in building PPC systems. Unfortunately, because + * openfirmware as originally specified neither captures nor standardizes + * all possible information, and also because of bugs, most OSs use a hybrid + * configuration scheme that relies both on verification of devices and + * recording information from openfirmware to be treated as hints. + */ +VOID OfwCopyDeviceTree(PPPC_DEVICE_TREE tree, int innode) +{ + int proplen = 0, node = innode; + char *prev_name, cur_name[64], data[256], *slash; + + /* Add properties */ + for (prev_name = ""; ofw_nextprop(node, prev_name, cur_name) == 1; ) + { + proplen = ofw_getproplen(node, cur_name); + if (proplen > 256 || proplen < 0) + { + printf("Warning: not getting prop %s (too long: %d)\n", + cur_name, proplen); + continue; + } + ofw_getprop(node, cur_name, data, sizeof(data)); + PpcDevTreeAddProperty(tree, 0, cur_name, data, proplen); + strcpy(data, cur_name); + prev_name = data; + } + + /* Subdevices */ + for (node = ofw_child(node); node; node = ofw_peer(node)) + { + ofw_package_to_path(node, data, sizeof(data)); + slash = strrchr(data, '/'); + if (slash) slash++; else continue; + PpcDevTreeAddDevice(tree, 0, slash); + OfwCopyDeviceTree(tree, node); + PpcDevTreeCloseDevice(tree); + } +} + VOID PpcHwDetect() { - printf("PpcHwDetect\n"); - /* Almost all PowerPC boxen use PCI */ - BootInfo.machineType = PCIBus; + PPC_DEVICE_TREE tree; + int node = ofw_finddevice("/"); + + /* Start the tree */ + if(!PpcDevTreeInitialize + (&tree, + PAGE_SIZE, sizeof(long long), + (PPC_DEVICE_ALLOC)MmAllocateMemory, + (PPC_DEVICE_FREE)MmFreeMemory)) + return; + + OfwCopyDeviceTree(&tree,node); + + PpcDevTreeCloseDevice(&tree); + + BootInfo.machine = tree.head; } BOOLEAN PpcDiskNormalizeSystemPath(char *SystemPath, unsigned Size) { Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Sun Nov 11 14:14:52 2007 @@ -207,7 +207,9 @@ reactos_memory_map[i].length_low = tmp; } + printf("PpcInitializeMmu\n"); PpcInitializeMmu(0); + printf("PpcInitializeMmu done\n"); /* We'll use vsid 1 for freeldr (expendable) */ MmuAllocVsid(1, 0xff); @@ -222,6 +224,14 @@ i += (1<<PFN_SHIFT) ) { FrLdrAddPageMapping(&memmap, 0, i, KernelBase + i - (ULONG)KernelMemory); + } + + /* Map device data */ + for (i = (ULONG)BootInfo.machine; + i < (ULONG)PpcDevTreeSiblingNode(BootInfo.machine); + i += (1<<PFN_SHIFT) ) + { + FrLdrAddPageMapping(&memmap, 0, i, 0); } /* Map module name strings */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c Sun Nov 11 14:14:52 2007 @@ -65,9 +65,6 @@ void PpcPrepVideoPrepareForReactOS(BOOLEAN setup) { - /* Prep boxen are PCI */ - BootInfo.machineType = PCIBus; - pci_setup(&pci1_desc); } VOID PpcInitializeMmu(int max); @@ -109,6 +106,83 @@ return 1; } +/* Most PReP hardware is in standard locations, based on the corresponding + * hardware on PCs. */ +VOID PpcPrepHwDetect() { + PPC_DEVICE_TREE tree; + PPC_DEVICE_RANGE range; + int interrupt; + + /* Start the tree */ + if(!PpcDevTreeInitialize + (&tree, + PAGE_SIZE, sizeof(long long), + (PPC_DEVICE_ALLOC)MmAllocateMemory, + (PPC_DEVICE_FREE)MmFreeMemory)) + return; + + /* PCI Bus */ + PpcDevTreeAddDevice(&tree, PPC_DEVICE_PCI_EAGLE, "pci"); + + /* Check out the devices on the bus */ + pci_setup(&tree, &pci1_desc); + + /* End PCI Bus */ + PpcDevTreeCloseDevice(&tree); + + /* ISA Bus */ + PpcDevTreeAddDevice(&tree, PPC_DEVICE_ISA_BUS, "isa"); + + /* Serial port */ + PpcDevTreeAddDevice(&tree, PPC_DEVICE_SERIAL_8250, "com1"); + range.start = (PVOID)0x800003f8; + range.len = 8; + range.type = PPC_DEVICE_IO_RANGE; + interrupt = 4; + PpcDevTreeAddProperty + (&tree, PPC_DEVICE_SPACE_RANGE, "reg", (char *)&range, sizeof(range)); + PpcDevTreeAddProperty + (&tree, PPC_DEVICE_INTERRUPT, "interrupt", + (char *)&interrupt, sizeof(interrupt)); + PpcDevTreeCloseDevice(&tree); + + /* We probably have an ISA IDE controller */ + PpcDevTreeAddDevice(&tree, PPC_DEVICE_IDE_DISK, "ide0"); + range.start = (PVOID)0x800001f8; + range.len = 8; + range.type = PPC_DEVICE_IO_RANGE; + interrupt = 14; + PpcDevTreeAddProperty + (&tree, PPC_DEVICE_SPACE_RANGE, "reg", (char *)&range, sizeof(range)); + PpcDevTreeAddProperty + (&tree, PPC_DEVICE_INTERRUPT, "interrupt", + (char *)&interrupt, sizeof(interrupt)); + PpcDevTreeCloseDevice(&tree); + + /* Describe VGA */ + PpcDevTreeAddDevice(&tree, PPC_DEVICE_VGA, "vga"); + range.start = (PVOID)0x800003c0; + range.len = 0x20; + range.type = PPC_DEVICE_IO_RANGE; + PpcDevTreeAddProperty + (&tree, PPC_DEVICE_SPACE_RANGE, "reg", (char *)&range, sizeof(range)); + range.start = BootInfo.dispDeviceBase; + range.len = BootInfo.dispDeviceRowBytes * BootInfo.dispDeviceRect[3]; + range.type = PPC_DEVICE_MEM_RANGE; + PpcDevTreeAddProperty + (&tree, PPC_DEVICE_SPACE_RANGE, "mem", (char *)&range, sizeof(range)); + PpcDevTreeCloseDevice(&tree); + + /* End ISA Bus */ + PpcDevTreeCloseDevice(&tree); + + /* And finish by closing the root node */ + PpcDevTreeCloseDevice(&tree); + + /* Now fish out the root node. The dev tree is a slab of memory */ + BootInfo.machine = PpcDevTreeGetRootNode(&tree); +} + void PpcPrepInit() { MachVtbl.ConsPutChar = PpcPrepPutChar; @@ -129,6 +203,7 @@ MachVtbl.VideoPrepareForReactOS = PpcPrepVideoPrepareForReactOS; MachVtbl.GetMemoryMap = PpcPrepGetMemoryMap; + MachVtbl.HwDetect = PpcPrepHwDetect; printf( "FreeLDR version [%s]\n", GetFreeLoaderVersionString() ); Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h Sun Nov 11 14:14:52 2007 @@ -1,5 +1,7 @@ #ifndef FREELDR_ARCH_POWERPC_PREP_H #define FREELDR_ARCH_POWERPC_PREP_H + +#include "ppcboot.h" extern struct _pci_desc pci1_desc; extern struct _idectl_desc ide1_desc; @@ -15,10 +17,11 @@ void ide_setup( void *extension ); void print_bar( struct _pci_bar *bar ); -void pci_setup( struct _pci_desc *pci_desc ); +void pci_setup( PPC_DEVICE_TREE *tree, struct _pci_desc *pci_desc ); void pci_read_bar( struct _pci_desc *pci_desc, int bus, int dev, int fn, int bar, struct _pci_bar *bar_data ); -void vga_setup( struct _pci_desc *pci_desc, struct _vga_desc *vga_desc, +void vga_setup( PPC_DEVICE_TREE *tree, + struct _pci_desc *pci_desc, struct _vga_desc *vga_desc, int bus, int dev, int fn ); #endif//FREELDR_ARCH_POWERPC_PREP_H Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep_pci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep_pci.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep_pci.c Sun Nov 11 14:14:52 2007 @@ -93,7 +93,7 @@ #define PCI_HEADER_TYPE 0xe #define PCI_BASECLASS 0xb -void pci_setup( pci_desc *desc ) { +void pci_setup( PPC_DEVICE_TREE *tree, pci_desc *desc ) { unsigned char type; unsigned short vendor, device, devclass; int funcs, bus, dev, fn; @@ -117,7 +117,7 @@ if( devclass == 3 ) { printf("Setting up vga...\n"); - vga_setup(desc,&vga1_desc,bus,dev,fn); + vga_setup(tree,desc,&vga1_desc,bus,dev,fn); printf("Done with vga\n"); } } Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep_vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep_vga.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep_vga.c Sun Nov 11 14:14:52 2007 @@ -13,7 +13,8 @@ #define VGA_HEIGHT 768 struct _vga_desc vga1_desc = { (char *)0x800003c0 }; -void vga_setup( struct _pci_desc *desc, struct _vga_desc *vga_desc, +void vga_setup( PPC_DEVICE_TREE *tree, + struct _pci_desc *desc, struct _vga_desc *vga_desc, int bus, int dev, int fn ) { struct _pci_bar bar_data; int i; Modified: trunk/reactos/lib/lib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lib.rbuild?rev=30354&r… ============================================================================== --- trunk/reactos/lib/lib.rbuild (original) +++ trunk/reactos/lib/lib.rbuild Sun Nov 11 14:14:52 2007 @@ -28,6 +28,9 @@ <directory name="ppcmmu"> <xi:include href="ppcmmu/ppcmmu.rbuild" /> </directory> + <directory name="ppcdevtree"> + <xi:include href="ppcdevtree/ppcdevtree.rbuild" /> + </directory> <directory name="pseh"> <xi:include href="pseh/pseh.rbuild" /> </directory> Modified: trunk/reactos/lib/ppcdevtree/devtree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcdevtree/devtree.c?r… ============================================================================== --- trunk/reactos/lib/ppcdevtree/devtree.c (original) +++ trunk/reactos/lib/ppcdevtree/devtree.c Sun Nov 11 14:14:52 2007 @@ -46,11 +46,13 @@ if (tree->alloc_size >= newSize) return tree->head; newArea = tree->allocFn(newSize); if (!newArea) return NULL; - memcpy(newArea, tree->head, tree->alloc_size); + memcpy(newArea, tree->head, tree->used_bytes); tree->alloc_size = newSize; if (tree->active) tree->active = - (((char *)tree->active) - ((char *)tree->head)) + newArea; + (PPPC_DEVICE_NODE) + (((char *)tree->active) - ((char *)tree->head) + + ((char *)newArea)); if (tree->head) tree->freeFn(tree->head); tree->head = newArea; return tree->head; @@ -125,6 +127,9 @@ newHead = (PPPC_DEVICE_NODE) (((char *)tree->active) + tree->active->total_size); memset(newHead, 0, size); + tree->used_bytes = + (((char *)newHead) + DT_ROUND_UP(newHead->this_size, tree->align)) - + ((char *)tree->head); return newHead; } @@ -145,6 +150,9 @@ tree->active->total_size = (((char *)newprop) + DT_ROUND_UP(newprop->this_size, tree->align)) - ((char *)tree->active); + tree->used_bytes = + (((char *)newprop) + DT_ROUND_UP(newprop->this_size, tree->align)) - + ((char *)tree->head); return PPC_DT_TRUE; }

1 0

[fireball] 30353: - Fix two more typos, now exception handling doesn't lead to an infinite loop resulting in a stack overflow and thus unhandled exception being caught by ntoskrnl.
by fireball＠svn.reactos.org 11 Nov '07

11 Nov '07

Author: fireball Date: Sun Nov 11 13:03:12 2007 New Revision: 30353 URL: http://svn.reactos.org/svn/reactos?rev=30353&view=rev Log: - Fix two more typos, now exception handling doesn't lead to an infinite loop resulting in a stack overflow and thus unhandled exception being caught by ntoskrnl. Modified: trunk/reactos/lib/sdk/crt/except_nt/i386/seh.s Modified: trunk/reactos/lib/sdk/crt/except_nt/i386/seh.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except_nt/i386… ============================================================================== --- trunk/reactos/lib/sdk/crt/except_nt/i386/seh.s (original) +++ trunk/reactos/lib/sdk/crt/except_nt/i386/seh.s Sun Nov 11 13:03:12 2007 @@ -209,7 +209,7 @@ /* Get the try level and scope table */ mov esi, [ebx+12] - mov esi, [ebx+8] + mov edi, [ebx+8] except_loop2: /* Validate try level */ @@ -331,7 +331,7 @@ /* Get the try level and scope table */ mov esi, [ebx+12] - mov esi, [ebx+8] + mov edi, [ebx+8] /* FIXME: Validate the SEH exception */

1 0

[arty] 30352: Add structures related to devtree.c
by arty＠svn.reactos.org 11 Nov '07

11 Nov '07

Author: arty Date: Sun Nov 11 12:27:07 2007 New Revision: 30352 URL: http://svn.reactos.org/svn/reactos?rev=30352&view=rev Log: Add structures related to devtree.c Modified: trunk/reactos/include/reactos/ppcboot.h Modified: trunk/reactos/include/reactos/ppcboot.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/ppcboot.h?… ============================================================================== --- trunk/reactos/include/reactos/ppcboot.h (original) +++ trunk/reactos/include/reactos/ppcboot.h Sun Nov 11 12:27:07 2007 @@ -1,10 +1,46 @@ #ifndef REACTOS_PPCBOOT_H #define REACTOS_PPCBOOT_H + +typedef enum _PPC_DT_BOOLEAN +{ + PPC_DT_FALSE, PPC_DT_TRUE +} PPC_DT_BOOLEAN; + +#ifndef NULL +#define NULL ((void *)0) +#endif + +typedef void * (*PPC_DEVICE_ALLOC)(int bytes); +typedef void (*PPC_DEVICE_FREE)(void *data); + +typedef struct _PPC_DEVICE_NODE +{ + int type; + int parent; + short this_size, total_size; + short value_offset, value_size; + char name[1]; +} PPC_DEVICE_NODE, *PPPC_DEVICE_NODE; + +typedef struct _PPC_DEVICE_TREE +{ + int alloc_size, alloc_step, align, used_bytes; + PPC_DEVICE_ALLOC allocFn; + PPC_DEVICE_FREE freeFn; + PPPC_DEVICE_NODE head, active; +} PPC_DEVICE_TREE, *PPPC_DEVICE_TREE; + +typedef struct _PPC_DEVICE_RANGE +{ + int type; + void *start; + int len; +} PPC_DEVICE_RANGE, *PPPC_DEVICE_RANGE; typedef char font_char[57]; typedef struct _boot_infos_t { void *loaderBlock; - int machineType; + PPPC_DEVICE_NODE machine; int dispDeviceRect[4]; int dispDeviceRowBytes; int dispDeviceDepth; @@ -12,4 +48,36 @@ font_char *dispFont; } boot_infos_t; +PPC_DT_BOOLEAN PpcDevTreeInitialize +(PPPC_DEVICE_TREE tree, int alloc_step, int align, + PPC_DEVICE_ALLOC allocFn, PPC_DEVICE_FREE freeFn); +PPPC_DEVICE_NODE PpcDevTreeGetRootNode(PPPC_DEVICE_TREE tree); +PPC_DT_BOOLEAN PpcDevTreeNodeIsChild +(PPPC_DEVICE_NODE parent, PPPC_DEVICE_NODE child); +PPPC_DEVICE_NODE PpcDevTreeChildNode(PPPC_DEVICE_NODE parent); +PPPC_DEVICE_NODE PpcDevTreeParentNode(PPPC_DEVICE_NODE child); +PPPC_DEVICE_NODE PpcDevTreeSiblingNode(PPPC_DEVICE_NODE this_entry); +PPC_DT_BOOLEAN PpcDevTreeAddProperty +(PPPC_DEVICE_TREE tree, int type, char *propname, char *propval, int proplen); +PPC_DT_BOOLEAN PpcDevTreeAddDevice +(PPPC_DEVICE_TREE tree, int type, char *name); +PPC_DT_BOOLEAN PpcDevTreeCloseDevice(PPPC_DEVICE_TREE tree); +PPPC_DEVICE_NODE PpcDevTreeFindDevice +(PPPC_DEVICE_NODE root, int type, char *name); +char *PpcDevTreeFindProperty +(PPPC_DEVICE_NODE root, int type, char *name, int *len); + +#define PPC_DT_FOURCC(w,x,y,z) (((w) << 24) | ((x) << 16) | ((y) << 8) | (z)) +#define PPC_DEVICE_SERIAL_8250 PPC_DT_FOURCC('8','2','5','0') +#define PPC_DEVICE_PCI_EAGLE PPC_DT_FOURCC('E','g','l','e') +#define PPC_DEVICE_ISA_BUS PPC_DT_FOURCC('I','S','A','b') +#define PPC_DEVICE_IDE_DISK PPC_DT_FOURCC('I','D','E','c') +#define PPC_DEVICE_VGA PPC_DT_FOURCC('V','G','A','c') + +#define PPC_DEVICE_IO_RANGE PPC_DT_FOURCC('I','O','r','g') +#define PPC_DEVICE_MEM_RANGE PPC_DT_FOURCC('M','E','M','r') +#define PPC_DEVICE_VADDR PPC_DT_FOURCC('v','a','d','r') +#define PPC_DEVICE_SPACE_RANGE PPC_DT_FOURCC('r','a','n','g') +#define PPC_DEVICE_INTERRUPT PPC_DT_FOURCC('I','n','t','r') + #endif/*REACTOS_PPCBOOT_H*/

1 0

[arty] 30351: Simple way to encode a device tree for early boot operations.
by arty＠svn.reactos.org 11 Nov '07

11 Nov '07

Author: arty Date: Sun Nov 11 12:23:05 2007 New Revision: 30351 URL: http://svn.reactos.org/svn/reactos?rev=30351&view=rev Log: Simple way to encode a device tree for early boot operations. Added: trunk/reactos/lib/ppcdevtree/ trunk/reactos/lib/ppcdevtree/devtree.c (with props) trunk/reactos/lib/ppcdevtree/ppcdevtree.rbuild (with props) Added: trunk/reactos/lib/ppcdevtree/devtree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcdevtree/devtree.c?r… ============================================================================== --- trunk/reactos/lib/ppcdevtree/devtree.c (added) +++ trunk/reactos/lib/ppcdevtree/devtree.c Sun Nov 11 12:23:05 2007 @@ -1,0 +1,202 @@ +/* + * FreeLoader + * Copyright (C) 2007 arty + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/* A hardware describing device tree + * Upper layers will describe hardware they recognize in here. Hal will need + * this info to configure PICs, timers and such. + * + * When booting on openfirmware, we copy recognized devices from the device + * tree. Other host types will configure it in different ways. + * + * Structure is a flat buffer stacked with PPC_DEVICE_NODEs, built as a tree. + * Each node's child set is terminated by an empty (0) node. + * Nodes are followed directly by properties and child nodes, which are + * followed by their own child nodes, etc. + * + * A small management structure is used while the tree is being created, then + * ignored when the tree is sent to upper layers. + */ + +#include <string.h> +#include <ppcboot.h> + +#define DT_ROUND_UP(x,round) (((x) + (round - 1)) & ~(round - 1)) + +PPPC_DEVICE_NODE PpcDevTreeGrow(PPPC_DEVICE_TREE tree, int newEntry) +{ + int newSize = + DT_ROUND_UP(tree->used_bytes + newEntry, tree->alloc_step); + PPPC_DEVICE_NODE newArea; + if (tree->alloc_size >= newSize) return tree->head; + newArea = tree->allocFn(newSize); + if (!newArea) return NULL; + memcpy(newArea, tree->head, tree->alloc_size); + tree->alloc_size = newSize; + if (tree->active) + tree->active = + (((char *)tree->active) - ((char *)tree->head)) + newArea; + if (tree->head) tree->freeFn(tree->head); + tree->head = newArea; + return tree->head; +} + +PPC_DT_BOOLEAN PpcDevTreeInitialize +(PPPC_DEVICE_TREE tree, int alloc_step, int align, + PPC_DEVICE_ALLOC allocFn, PPC_DEVICE_FREE freeFn) +{ + tree->alloc_size = 0; + tree->alloc_step = alloc_step; + tree->used_bytes = 0; + tree->align = align; + tree->allocFn = allocFn; + tree->freeFn = freeFn; + /* Initialize */ + tree->active = tree->head = NULL; + /* Add a root node */ + tree->head = PpcDevTreeGrow(tree, sizeof(PPC_DEVICE_NODE) + 1); + if (!tree->head) return PPC_DT_FALSE; + memset(tree->head, 0, sizeof(*tree->head) + 1); + strcpy(tree->head->name, "/"); + tree->head->this_size = tree->head->total_size = + DT_ROUND_UP(sizeof(PPC_DEVICE_NODE)+1, tree->align); + tree->active = tree->head; + return tree->head != NULL; +} + +PPPC_DEVICE_NODE PpcDevTreeGetRootNode(PPPC_DEVICE_TREE tree) +{ + return tree->head; +} + +PPC_DT_BOOLEAN PpcDevTreeNodeIsChild +(PPPC_DEVICE_NODE parent, PPPC_DEVICE_NODE child) +{ + char *this_entry = (char *)parent; + char *next_entry = ((char *)parent) + parent->total_size; + char *want_entry = (char *)child; + return want_entry > this_entry && want_entry < next_entry; +} + +PPPC_DEVICE_NODE PpcDevTreeChildNode(PPPC_DEVICE_NODE parent) +{ + char *next_entry = ((char *)parent) + parent->this_size; + PPPC_DEVICE_NODE next = (PPPC_DEVICE_NODE)next_entry; + if (PpcDevTreeNodeIsChild(parent, next)) return next; else return NULL; +} + +PPPC_DEVICE_NODE PpcDevTreeParentNode(PPPC_DEVICE_NODE child) +{ + char *parent = ((char *)child) - child->parent; + if (!child->parent) return NULL; else return (PPPC_DEVICE_NODE)parent; +} + +PPPC_DEVICE_NODE PpcDevTreeSiblingNode(PPPC_DEVICE_NODE this_entry) +{ + char *next_entry = ((char *)this_entry) + this_entry->total_size; + PPPC_DEVICE_NODE next = (PPPC_DEVICE_NODE)next_entry; + if (PpcDevTreeNodeIsChild(PpcDevTreeParentNode(this_entry), next)) + return next; + else + return NULL; +} + +static +PPPC_DEVICE_NODE PpcDevTreeAllocChild(PPPC_DEVICE_TREE tree, int size) +{ + PPPC_DEVICE_NODE newHead = + PpcDevTreeGrow(tree, DT_ROUND_UP(size, tree->align)); + if (newHead == NULL) return NULL; + newHead = (PPPC_DEVICE_NODE) + (((char *)tree->active) + tree->active->total_size); + memset(newHead, 0, size); + return newHead; +} + +PPC_DT_BOOLEAN PpcDevTreeAddProperty +(PPPC_DEVICE_TREE tree, int type, char *propname, char *propval, int proplen) +{ + int propname_len = DT_ROUND_UP(strlen(propname) + 1, tree->align); + int entry_len = sizeof(PPC_DEVICE_NODE) + propname_len + proplen; + PPPC_DEVICE_NODE newprop = PpcDevTreeAllocChild(tree, entry_len); + if (!newprop) return PPC_DT_FALSE; + newprop->type = type; + newprop->parent = ((char *)newprop) - ((char *)tree->active); + newprop->this_size = entry_len; + newprop->value_offset = propname_len; + newprop->value_size = proplen; + strcpy(newprop->name, propname); + memcpy(newprop->name + newprop->value_offset, propval, proplen); + tree->active->total_size = + (((char *)newprop) + DT_ROUND_UP(newprop->this_size, tree->align)) - + ((char *)tree->active); + return PPC_DT_TRUE; +} + +PPC_DT_BOOLEAN PpcDevTreeAddDevice +(PPPC_DEVICE_TREE tree, int type, char *name) +{ + int entry_len = sizeof(PPC_DEVICE_NODE) + strlen(name); + PPPC_DEVICE_NODE newprop = PpcDevTreeAllocChild(tree, entry_len); + if (!newprop) return PPC_DT_FALSE; + newprop->type = type; + newprop->parent = ((char *)newprop) - ((char *)tree->active); + newprop->this_size = newprop->total_size = + DT_ROUND_UP(entry_len, tree->align); + strcpy(newprop->name, name); + tree->active->total_size = + (((char *)newprop) + DT_ROUND_UP(newprop->this_size, tree->align)) - + ((char *)tree->active); + tree->active = newprop; + return PPC_DT_TRUE; +} + +PPC_DT_BOOLEAN PpcDevTreeCloseDevice(PPPC_DEVICE_TREE tree) +{ + PPPC_DEVICE_NODE parent = PpcDevTreeParentNode(tree->active); + if (!parent) return PPC_DT_FALSE; + parent->total_size = tree->active->total_size + tree->active->parent; + tree->active = parent; + return PPC_DT_TRUE; +} + +PPPC_DEVICE_NODE PpcDevTreeFindDevice +(PPPC_DEVICE_NODE root, int type, char *name) +{ + PPPC_DEVICE_NODE found = NULL; + if (name && !strcmp(root->name, name)) return root; + if (type && root->type == type) return root; + for (root = PpcDevTreeChildNode(root); + root && !(found = PpcDevTreeFindDevice(root, type, name)); + root = PpcDevTreeSiblingNode(root)); + return found; +} + +char *PpcDevTreeFindProperty +(PPPC_DEVICE_NODE root, int type, char *name, int *len) +{ + for (root = PpcDevTreeChildNode(root); + root && + root->value_offset && + (!strcmp(root->name, name) && + (!type || root->type == type)); + root = PpcDevTreeSiblingNode(root)); + if (len) + *len = root->value_size; + return root->name + root->value_offset; +} Propchange: trunk/reactos/lib/ppcdevtree/devtree.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/ppcdevtree/ppcdevtree.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcdevtree/ppcdevtree.… ============================================================================== --- trunk/reactos/lib/ppcdevtree/ppcdevtree.rbuild (added) +++ trunk/reactos/lib/ppcdevtree/ppcdevtree.rbuild Sun Nov 11 12:23:05 2007 @@ -1,0 +1,6 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<module name="ppcdevtree" type="staticlibrary"> + <include base="ReactOS">include/reactos</include> + <file>devtree.c</file> +</module> Propchange: trunk/reactos/lib/ppcdevtree/ppcdevtree.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[jimtabor] 30350: We need a dpdev support for DX. All should go into ntgdidx.h.
by jimtabor＠svn.reactos.org 11 Nov '07

11 Nov '07

Author: jimtabor Date: Sun Nov 11 08:17:16 2007 New Revision: 30350 URL: http://svn.reactos.org/svn/reactos?rev=30350&view=rev Log: We need a dpdev support for DX. All should go into ntgdidx.h. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Sun Nov 11 08:17:16 2007 @@ -500,9 +500,6 @@ INT DC_Flags; PDC_ATTR pDc_Attr; DC_ATTR Dc_Attr; - - struct _EDD_DIRECTDRAW_GLOBAL * pEDDgpl; - HDC hSelf; // Used only for MemoryDC & SaveDC. HDC hNext; HSURF FillPatternSurfaces[HS_DDI_MAX]; @@ -510,7 +507,6 @@ PDEVINFO DevInfo; HDEV GDIDevice; - DRIVER_FUNCTIONS DriverFunctions; UNICODE_STRING DriverName; HANDLE DeviceDriver; @@ -528,6 +524,13 @@ HANDLE hFile; LPENHMETAHEADER emh; + // This belongs in DHPDEV not in DC. 8^( + // So I'm putting it down here with the rest of misfits. + // DRIVER_FUNCTIONS does not belong in DC. It should go PVOID in dpdev. + DRIVER_FUNCTIONS DriverFunctions; + struct _EDD_DIRECTDRAW_GLOBAL * pEDDgpl; + // + } DC, *PDC; #endif

1 0

[arty] 30349: Doh. Fix bad vsid assignment.
by arty＠svn.reactos.org 11 Nov '07

11 Nov '07

Author: arty Date: Sun Nov 11 06:41:31 2007 New Revision: 30349 URL: http://svn.reactos.org/svn/reactos?rev=30349&view=rev Log: Doh. Fix bad vsid assignment. Modified: trunk/reactos/lib/ppcmmu/mmuobject.c Modified: trunk/reactos/lib/ppcmmu/mmuobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/mmuobject.c?rev… ============================================================================== --- trunk/reactos/lib/ppcmmu/mmuobject.c (original) +++ trunk/reactos/lib/ppcmmu/mmuobject.c Sun Nov 11 06:41:31 2007 @@ -561,7 +561,7 @@ if (Booted) SetSR(i, sr); Segs[i] = findvsid(s_vsid); - Vsid[i] = s_vsid; + Vsid[i] = vsid; } }

1 0

[arty] 30348: - Don't touch real segments until after booting. - Hang function isn't too useful.
by arty＠svn.reactos.org 11 Nov '07

11 Nov '07

Author: arty Date: Sun Nov 11 06:19:17 2007 New Revision: 30348 URL: http://svn.reactos.org/svn/reactos?rev=30348&view=rev Log: - Don't touch real segments until after booting. - Hang function isn't too useful. Modified: trunk/reactos/lib/ppcmmu/mmuobject.c Modified: trunk/reactos/lib/ppcmmu/mmuobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/mmuobject.c?rev… ============================================================================== --- trunk/reactos/lib/ppcmmu/mmuobject.c (original) +++ trunk/reactos/lib/ppcmmu/mmuobject.c Sun Nov 11 06:19:17 2007 @@ -59,7 +59,7 @@ MmuFreePage *FreeList; // Pages are allocated one by one until NextPage == RamSize >> PPC_PAGE_SHIFT // Then we take only from the free list -int Clock = 0, TreeAlloc = 0, GdbAttach = 0; +int Clock = 0, TreeAlloc = 0, GdbAttach = 0, Booted = 0, Vsid[16]; paddr_t RamSize, FirstUsablePage, NextPage; MmuVsidTree *NextTreePage = 0; MmuFreeTree *FreeTree; @@ -112,7 +112,7 @@ case 0xa: case 0xc: case 0x20: - if (!callback[action](action,trap_frame)) hang(action, trap_frame); + if (!callback[action](action,trap_frame)) TakeException(action, trap_frame); break; /* MMU Functions */ @@ -241,21 +241,10 @@ return 1; } -int hang(int trapCode, ppc_trap_frame_t *trap) -{ - if (!GdbAttach) - { - GdbAttach = 1; - SerialSetUp(0, (void *)0x800003f8, 9600); - } - while(1) SerialInterrupt(trapCode, trap); - return 1; -} - int fpenable(int trapCode, ppc_trap_frame_t *trap) { /* Turn on FP */ - trap->srr0 |= 8192; + trap->srr1 |= 8192; return 1; } @@ -286,7 +275,7 @@ /* Default to hang on unknown exception */ for(i = 0; i < 30; i++) { - callback[i] = hang; + callback[i] = TakeException; if (i != 1) /* Preserve reset handler */ copy_trap_handler(i); } @@ -569,8 +558,10 @@ { s_vsid = (vsid << 4) | (i & 15); sr = (GetSR(i) & ~PPC_VSID_MASK) | s_vsid; - SetSR(i, sr); + if (Booted) + SetSR(i, sr); Segs[i] = findvsid(s_vsid); + Vsid[i] = s_vsid; } } @@ -595,6 +586,17 @@ void callkernel(void *fun_ptr, void *arg) { + int i; + + Booted = 1; + + for (i = 0; i < 16; i++) + { + // Patch up the vsid map. We shouldn't muck with these until we're + // booted. + mmusetvsid(i, i+1, Vsid[i]); + } + void (*fun)(void *) = fun_ptr; __asm__("mfmsr 3\n\t" "ori 3,3,0x30\n\t"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs