GitLab has been upgraded to 13.3.6. If you encounter any issues mail code@riscosopen.org

Commit 9f272d38 authored by Robert Sprowson's avatar Robert Sprowson Committed by ROOL

Change to unsigned physical addresses

The prototype for vtophys returns an unsigned value, update this driver to match the port header file from USBDriver-1_31.

Version 0.37. Tagged as 'DWCDriver-0_37'
parent e706bc6b
......@@ -34,7 +34,7 @@ LIBS += ${DEBUGLIBS} ${NET5LIBS}
endif
CFLAGS += -wp -wc
CDEFINES += -DKERNEL -D_KERNEL -Dpaddr_t=int -D__P(A)=A -DKLD_MODULE -DDISABLE_PACKED
CDEFINES += -DKERNEL -D_KERNEL -D__P(A)=A -DKLD_MODULE -DDISABLE_PACKED
ROMCDEFINES = -DROM
CINCLUDES = -ITCPIPLibs:,C:USB,OS:
CMHGDEPENDS = cmodule dwc_otg_riscos softc_root softc_device
......
/* (0.36)
/* (0.37)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 0.36
#define Module_MajorVersion_CMHG 0.37
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 22 Apr 2020
#define Module_Date_CMHG 04 Jul 2020
#define Module_MajorVersion "0.36"
#define Module_Version 36
#define Module_MajorVersion "0.37"
#define Module_Version 37
#define Module_MinorVersion ""
#define Module_Date "22 Apr 2020"
#define Module_Date "04 Jul 2020"
#define Module_ApplicationDate "22-Apr-20"
#define Module_ApplicationDate "04-Jul-20"
#define Module_ComponentName "DWCDriver"
#define Module_FullVersion "0.36"
#define Module_HelpVersion "0.36 (22 Apr 2020)"
#define Module_LibraryVersionInfo "0:36"
#define Module_FullVersion "0.37"
#define Module_HelpVersion "0.37 (04 Jul 2020)"
#define Module_LibraryVersionInfo "0:37"
......@@ -90,11 +90,10 @@ callout_reset (struct callout *c, int i, void (*f)(void *), void *v) {
callx_add_callafter ((i + 9) / 10, callout_handler, c);
}
void* vtophys (void** v)
void *vtophys (void* v)
{
#ifndef EMULATE
struct {
void* page;
int page;
void* logical;
void* physical;
} block;
......@@ -102,10 +101,6 @@ void* vtophys (void** v)
_swix (OS_Memory, _INR (0, 2), (1<<9) + (1<<13), &block, 1);
return block.physical;
#else
// dprintf (("Port", "Converting physical address %p\n", *v));
return v; // return actual address for the moment
#endif
}
void* malloc_contig(int len, int alignment)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment