Optimise , add option to not wait for mailbox

dp111 · Jun 3, 2022 · a89cfed · a89cfed
1 parent db537a1
commit a89cfed
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/src/Pi1MHz.c b/src/Pi1MHz.c
@@ -128,7 +128,7 @@ static emulator_list emulator[] = {
 
 uint8_t *JIM_ram; // 480M Bytes of RAM for pizero
 
-uint32_t JIM_ram_size; // Size of JIM ram in 16Mbyte steps
+uint8_t JIM_ram_size; // Size of JIM ram in 16Mbyte steps
 
 // Memory for FRED and JIM
 static uint8_t * const Pi1MHz_Memory = (uint8_t *)0x100;
@@ -271,7 +271,7 @@ static void init_emulator() {
    RPI_PropertyAdd(DATABUS_TO_OUTPUTS); // r3
    RPI_PropertyAdd(TEST_PINS_OUTPUTS); // r4
    RPI_PropertyAdd(0); // r5 TEST_MASK
-   RPI_PropertyProcess();
+   RPI_PropertyProcess(false);
 
    RPI_IRQBase->FIQ_control = 0x80 + 67; // doorbell FIQ
 
@@ -317,13 +317,13 @@ static void init_JIM()
    extern char _end;
 
    RPI_PropertySetWord(0x00038030,12,1); // Set domain 12 ISP
-   JIM_ram_size = mem_info(1); // get size of ram
-   JIM_ram_size = JIM_ram_size - (unsigned int)&_end; // remove program
-   JIM_ram_size = JIM_ram_size -( 4*1024*1024) ; // 4Mbytes for other mallocs
-   JIM_ram_size = JIM_ram_size & 0xFF000000; // round down to 16Mbyte boundary
-   JIM_ram_size = JIM_ram_size >> 24 ; // set to 16Mbyte sets
+   uint32_t temp = mem_info(1); // get size of ram
+   temp = temp - (unsigned int)&_end; // remove program
+   temp = temp -( 4*1024*1024) ; // 4Mbytes for other mallocs
+   temp = temp & 0xFF000000; // round down to 16Mbyte boundary
+   JIM_ram_size = (uint8_t)(temp >> 24) ; // set to 16Mbyte sets
 
-   fx_register[0] = (uint8_t)JIM_ram_size;  // fx addr 0 returns ram size
+   fx_register[0] = JIM_ram_size;  // fx addr 0 returns ram size
 
    JIM_ram = (uint8_t *) malloc(16*1024*1024*JIM_ram_size); // malloc 480Mbytes
 

diff --git a/src/Pi1MHz.h b/src/Pi1MHz.h
@@ -178,7 +178,7 @@ nPCFD IO25 Pin 22 o o Pin 21 IO9  D7
 #include <stdbool.h>
 #include <stdint.h>
 // JIM_ram_size is in 16Mbyte steps
-extern uint32_t JIM_ram_size;
+extern uint8_t JIM_ram_size;
 
 extern uint8_t * JIM_ram;
 

diff --git a/src/framebuffer.c b/src/framebuffer.c
@@ -1402,7 +1402,7 @@ static void fb_initialize() {
     RPI_PropertyNewTag(TAG_SET_PHYSICAL_SIZE,2); RPI_PropertyAddTwoWords(SCREEN_WIDTH, SCREEN_HEIGHT );
     RPI_PropertyNewTag(TAG_SET_VIRTUAL_SIZE,2); RPI_PropertyAddTwoWords(SCREEN_WIDTH, SCREEN_HEIGHT *2 );
     RPI_PropertyNewTag(TAG_SET_DEPTH,1); RPI_PropertyAdd(SCREEN_DEPTH);
-    RPI_PropertyProcess();
+    RPI_PropertyProcess(true);
 
     if( ( mp = RPI_PropertyGet( TAG_ALLOCATE_BUFFER  ) ) )
     {

diff --git a/src/ram_emulator.c b/src/ram_emulator.c
@@ -63,7 +63,7 @@ void ram_emulator_page_addr(unsigned int gpio)
 
    if ( addr == 0xfd)
    {  if (data > (JIM_ram_size))
-         data = (uint8_t) JIM_ram_size;
+         data = JIM_ram_size;
       page_ram_addr = (page_ram_addr & 0x00FFFFFF) | data<<24;
    } else {
    if ( addr == 0xfe)

diff --git a/src/rpi/block.h b/src/rpi/block.h
@@ -71,7 +71,6 @@ struct emmc_block_dev
 	size_t block_size;
 	int use_sdma;
 	int card_removal;
-	uint32_t base_clock;
 };
 
 

diff --git a/src/rpi/mailbox.h b/src/rpi/mailbox.h
@@ -5,6 +5,7 @@
 #define PROP_SIZE        1024
 
 #include "base.h"
+#include <stdbool.h>
 
 #define RPI_MAILBOX0_BASE    ( PERIPHERAL_BASE + 0xB880 )
 #define RPI_MAILBOX1_BASE    ( PERIPHERAL_BASE + 0xB8A0 )
@@ -189,7 +190,7 @@ extern void RPI_PropertyStart(rpi_mailbox_tag_t tag, uint32_t length);
 extern void RPI_PropertyNewTag(rpi_mailbox_tag_t tag, uint32_t length);
 extern void RPI_PropertyAdd(uint32_t data);
 extern void RPI_PropertyAddTwoWords(uint32_t data, uint32_t data2);
-extern unsigned int RPI_PropertyProcess( void );
+extern unsigned int RPI_PropertyProcess( bool wait );
 extern void RPI_PropertyProcessNoCheck( void );
 extern rpi_mailbox_property_t* RPI_PropertyGet( rpi_mailbox_tag_t tag );