← Back to branch summary

~wolf-ramovsky/helenos/vesafb

« back to all changes in this revision

Viewing changes to uspace/lib/vbe/vbe.c

  • Committer: Wolf Ramovsky
  • Date: 2014-06-18 04:16:26 UTC
  • Revision ID: wolf_ramovsky-20140618041626-cemqudu4c0x7qxt9
Support amd64 configuration

Show diffs side-by-side

added added

removed removed

Lines of Context:
uspace/lib/vbe/vbe.c
42
42
#define VMEM_ROM_STRT   0x000a0000
43
43
#define VMEM_ROM_SIZE   (384*1024)
44
44
 
45
 
#define VBE_BUF_STRT    0x1000
46
 
#define VBE_BUF_SIZE    0x1000
 
45
#define VBE_BUF_STRT    PAGE_SIZE
 
46
#define VBE_BUF_SIZE    PAGE_SIZE
47
47
 
48
48
static const char vbeVersionString[] = "VBE2";
49
49
 
276
276
                return NULL;
277
277
}
278
278
 
279
 
#define UNKNOWN printf("libvbe: %s address unknown %p\n", __func__, (void*)addr)
 
279
#define UNKNOWN printf("libvbe: %s address unknown %p\n", __func__, (void*)(uintptr_t)addr)
280
280
 
281
281
#define RDM_DEF(T, F) \
282
282
static T F (struct x86emu *emu, uint32_t addr) \
323
323
static uint8_t inb(struct x86emu *emu, uint16_t addr)
324
324
{
325
325
        uint8_t ret;
326
 
        ret = pio_read_8((void*)(uint32_t)addr);
 
326
        ret = pio_read_8((void*)(uintptr_t)addr);
327
327
        return ret;
328
328
}
329
329
 
330
330
static uint16_t inw(struct x86emu *emu, uint16_t addr)
331
331
{
332
332
        uint16_t ret;
333
 
        ret = pio_read_16((void*)(uint32_t)addr);
 
333
        ret = pio_read_16((void*)(uintptr_t)addr);
334
334
        return ret;
335
335
}
336
336
 
337
337
static uint32_t inl(struct x86emu *emu, uint16_t addr)
338
338
{
339
339
        uint32_t ret;
340
 
        ret = pio_read_32((void*)(uint32_t)addr);
 
340
        ret = pio_read_32((void*)(uintptr_t)addr);
341
341
        return ret;
342
342
}
343
343
 
344
344
static void outb(struct x86emu *emu, uint16_t addr, uint8_t val)
345
345
{
346
 
        pio_write_8((void*)(uint32_t)addr, val);
 
346
        pio_write_8((void*)(uintptr_t)addr, val);
347
347
}
348
348
 
349
349
static void outw(struct x86emu *emu, uint16_t addr, uint16_t val)
350
350
{
351
 
        pio_write_16((void*)(uint32_t)addr, val);
 
351
        pio_write_16((void*)(uintptr_t)addr, val);
352
352
}
353
353
 
354
354
static void outl(struct x86emu *emu, uint16_t addr, uint32_t val)
355
355
{
356
 
        pio_write_32((void*)(uint32_t)addr, val);
 
356
        pio_write_32((void*)(uintptr_t)addr, val);
357
357
}