Rev 970 | Rev 1221 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 970 | Rev 1132 | ||
---|---|---|---|
Line 24... | Line 24... | ||
24 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
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 |
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. |
26 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
27 | */ |
27 | */ |
28 | 28 | ||
29 | #include <arch/boot/memmap.h> |
29 | #include <arch/boot/boot.h> |
30 | #include <arch/mm/memory_init.h> |
30 | #include <arch/mm/memory_init.h> |
31 | #include <typedefs.h> |
31 | #include <typedefs.h> |
32 | #include <print.h> |
32 | #include <print.h> |
33 | 33 | ||
34 | memmap_t memmap; |
- | |
35 | - | ||
36 | 34 | ||
37 | size_t get_memory_size(void) |
35 | size_t get_memory_size(void) |
38 | { |
36 | { |
39 | return memmap.total; |
37 | return bootinfo.memmap.total; |
40 | } |
38 | } |
41 | 39 | ||
42 | 40 | ||
43 | void memory_print_map(void) |
41 | void memory_print_map(void) |
44 | { |
42 | { |
45 | count_t i; |
43 | count_t i; |
46 | 44 | ||
47 | for (i = 0; i < memmap.count; i++) |
45 | for (i = 0; i < bootinfo.memmap.count; i++) |
48 | printf("base: %L size: %L\n", memmap.zones[i].start, memmap.zones[i].size); |
46 | printf("base: %L size: %L\n", bootinfo.memmap.zones[i].start, bootinfo.memmap.zones[i].size); |
49 | } |
47 | } |