Changeset 1e9a463 in mainline


Ignore:
Timestamp:
2005-08-30T13:17:10Z (19 years ago)
Author:
Josef Cejka <malyzelenyhnus@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6f878b7
Parents:
288a204
Message:

Licence to print1/test.c added.
New function for printing memory map at ia32.

Files:
5 edited

Legend:

Unmodified
Added
Removed

  • arch/ia32/include/mm/memory_init.h

    r288a204 r1e9a463  
    3434size_t get_memory_size(void);
    3535
     36void memory_print_map(void);
     37
    3638#endif

  • arch/ia32/src/ia32.c

    r288a204 r1e9a463  
    4646#include <arch/asm.h>
    4747#include <arch/acpi/acpi.h>
     48#include <arch/mm/memory_init.h>
    4849
    4950void arch_pre_mm_init(void)
    … …  
    7879{
    7980        if (config.cpu_active == 1) {
     81                memory_print_map();
     82               
    8083                #ifdef __SMP__
    8184                acpi_init();

  • arch/ia32/src/mm/frame.c

    r288a204 r1e9a463  
    4646               
    4747                for (i=e820counter;i>0;i--) {
    48                         printf("E820 base: %Q size: %Q type: %L \n",e820table[i-1].base_address,e820table[i-1].size,e820table[i-1].type);
    4948                        if (e820table[i-1].type!=MEMMAP_MEMORY_AVAILABLE) {
    5049                                frame_region_not_free(e820table[i-1].base_address,e820table[i-1].size);

  • arch/ia32/src/mm/memory_init.c

    r288a204 r1e9a463  
    3535}
    3636
     37void memory_print_map(void)
     38{
     39        __u8 i;
     40       
     41        for (i=e820counter;i>0;i--) {
     42                printf("E820 base: %Q size: %Q type: ", e820table[i-1].base_address, e820table[i-1].size);
     43                switch (e820table[i-1].type) {
     44                        case MEMMAP_MEMORY_AVAILABLE:
     45                                printf("available memory\n");
     46                                break;
     47                        case MEMMAP_MEMORY_RESERVED:
     48                                printf("reserved memory\n");
     49                                break;
     50                        case MEMMAP_MEMORY_ACPI:
     51                                printf("ACPI table\n");
     52                                break;
     53                        case MEMMAP_MEMORY_NVS:
     54                                printf("NVS\n");
     55                                break;
     56                        case MEMMAP_MEMORY_UNUSABLE:
     57                                printf("unusable memory\n");
     58                                break;
     59                        default:
     60                                printf("undefined memory type\n");
     61                }
     62        }
    3763
     64}
    3865

  • test/print/print1/test.c

    r288a204 r1e9a463  
    1 
     1/*
     2 * Copyright (C) 2005 Josef Cejka
     3 * All rights reserved.
     4 *
     5 * Redistribution and use in source and binary forms, with or without
     6 * modification, are permitted provided that the following conditions
     7 * are met:
     8 *
     9 * - Redistributions of source code must retain the above copyright
     10 *   notice, this list of conditions and the following disclaimer.
     11 * - Redistributions in binary form must reproduce the above copyright
     12 *   notice, this list of conditions and the following disclaimer in the
     13 *   documentation and/or other materials provided with the distribution.
     14 * - The name of the author may not be used to endorse or promote products
     15 *   derived from this software without specific prior written permission.
     16 *
     17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
     18 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
     19 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
     20 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
     21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
     22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
     23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
     24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
     26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     27 */
    228#include <print.h>
    329#include <test.h>
Note: See TracChangeset for help on using the changeset viewer.