rpitx/librpitx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Try to set right Peripherals base

Browse source
This commit is contained in:
F5OEO 2019-06-27 13:58:28 +01:00 committed by f5oeo
parent 5b5a4ee083
commit a3611e265e
2 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/dma.cpp
View file

@ -19,6 +19,7 @@ This program is free software: you can redistribute it and/or modify
#include "dma.h" #include "dma.h"
#include "stdio.h" #include "stdio.h"
#include "util.h" #include "util.h"
#include <bcm_host.h>
extern "C" extern "C"
{ {
@ -71,27 +72,16 @@ dma::dma(int Channel,uint32_t CBSize,uint32_t UserMemSize) // Fixme! Need to che
void dma::GetRpiInfo() void dma::GetRpiInfo()
{ {
RASPBERRY_PI_INFO_T info; dram_phys_base= bcm_host_get_sdram_address();
if (getRaspberryPiInformation(&info) > 0)
mem_flag = MEM_FLAG_HINT_PERMALOCK|MEM_FLAG_NO_INIT;//0x0c;
switch(dram_phys_base)
{ {
if(info.peripheralBase==RPI_BROADCOM_2835_PERIPHERAL_BASE) case 0x40000000 : mem_flag |=MEM_FLAG_L1_NONALLOCATING;break;
{ case 0xC0000000 : mem_flag |=MEM_FLAG_DIRECT;break;
default: dbg_printf(0,"Unknown Raspberry architecture\n");
dram_phys_base = 0x40000000;
mem_flag = MEM_FLAG_L1_NONALLOCATING|MEM_FLAG_HINT_PERMALOCK|MEM_FLAG_NO_INIT;//0x0c;
}
if((info.peripheralBase==RPI_BROADCOM_2836_PERIPHERAL_BASE)||(info.peripheralBase==RPI_BROADCOM_2837_PERIPHERAL_BASE))
{
dram_phys_base = 0xc0000000;
mem_flag = MEM_FLAG_DIRECT|MEM_FLAG_HINT_PERMALOCK|MEM_FLAG_NO_INIT;// 0x04;
}
}
else
{
dbg_printf(1,"Unknown Raspberry architecture\n");
} }
} }
dma::~dma() dma::~dma()

7
src/gpio.cpp
View file

@ -45,7 +45,12 @@ uint32_t gpio::GetPeripheralBase()
{ {
RASPBERRY_PI_INFO_T info; RASPBERRY_PI_INFO_T info;
uint32_t BCM2708_PERI_BASE = bcm_host_get_peripheral_address(); uint32_t BCM2708_PERI_BASE = bcm_host_get_peripheral_address();
dbg_printf(1,"Peri Base = %x\n",BCM2708_PERI_BASE); dbg_printf(1,"Peri Base = %x SDRAM %x\n",bcm_host_get_peripheral_address(),bcm_host_get_sdram_address());
if(BCM2708_PERI_BASE==0)
{
dbg_printf(0,"Unknown peripheral base, swith to PI4 \n");
BCM2708_PERI_BASE=0xfe000000;
}
/* /*
if (getRaspberryPiInformation(&info) > 0) if (getRaspberryPiInformation(&info) > 0)
{ {