untested simulator

Author: nift4

CMakeLists.txt

@@ -2,6 +2,29 @@ set(LV_CONF_INCLUDE_SIMPLE OFF)
 add_subdirectory(lib/lvgl)
 
 add_library(droidboot_gui STATIC
+		lib/ext4/ext4.c
+		lib/ext4/ext4_balloc.c
+		lib/ext4/ext4_bcache.c
+		lib/ext4/ext4_bitmap.c
+		lib/ext4/ext4_block_group.c
+		lib/ext4/ext4_blockdev.c
+		lib/ext4/ext4_crc32.c
+		lib/ext4/ext4_debug.c
+		lib/ext4/ext4_dir.c
+		lib/ext4/ext4_dir_idx.c
+		lib/ext4/ext4_extent.c
+		lib/ext4/ext4_fs.c
+		lib/ext4/ext4_hash.c
+		lib/ext4/ext4_ialloc.c
+		lib/ext4/ext4_inode.c
+		lib/ext4/ext4_journal.c
+		lib/ext4/ext4_mbr.c
+		lib/ext4/ext4_mkfs.c
+		lib/ext4/ext4_super.c
+		lib/ext4/ext4_trans.c
+		lib/ext4/ext4_xattr.c
+		lib/minigz/mini_gzip.c
+		lib/minigz/miniz.c
 		# List C/C++ source files with relative paths to this CMakeLists.txt.
 		common/droidboot_helpers.c
 		common/droidboot_init.c
@@ -22,7 +45,7 @@ add_library(droidboot_gui STATIC
 		droidboot_platforms/simulator/simulator.c
 		backend/droidboot_drivers.c
 		backend/droidboot_dualboot_backend.c)
-target_link_libraries(droidboot_gui PUBLIC lvgl)
+target_link_libraries(droidboot_gui PUBLIC lvgl android log nativehelper)
 add_compile_definitions(PLATFORM_SIMULATOR)
 target_include_directories(droidboot_gui PUBLIC
 		lib/libufdt/sysdeps/include

backend/droidboot_drivers.c

@@ -16,13 +16,13 @@ file_metadata abm_settings_metadata;
 // Next functions are only for lwext4, usually just wrappers
 static int droidboot_lwext_sd_dev_bread(struct ext4_blockdev *bdev, void *buf, uint32_t blk_id, uint32_t blk_cnt)
 {
-    dridboot_sd_read_block(buf, blk_id, blk_cnt);
+    droidboot_sd_read_block(buf, blk_id, blk_cnt);
     return DROIDBOOT_EOK;
 }
 
 static int droidboot_lwext_sd_dev_bwrite(struct ext4_blockdev *bdev, const void *buf,
 			  uint32_t blk_id, uint32_t blk_cnt){
-    dridboot_sd_write_block(buf, blk_id, blk_cnt);
+    droidboot_sd_write_block(buf, blk_id, blk_cnt);
     return DROIDBOOT_EOK;
 }
 

droidboot_platforms

@@ -81,7 +81,7 @@ static droidboot_error validate_mbr_partition(const struct mbr_part *part)
  * Return 0 on valid signature
  */
 static unsigned int
-partition_parse_gpt_header(unsigned char *buffer, struct gpt_header* header)
+partition_parse_gpt_header(const char *buffer, struct gpt_header* header)
 {
 	/* Check GPT Signature */
 	if (((uint32_t *) buffer)[0] != GPT_SIGNATURE_2 ||
@@ -135,7 +135,7 @@ droidboot_error droidboot_parse_gpt_on_sd()
 		unsigned int i, j, n;
 		int gpt_partitions_exist = 0;
 
-		dridboot_sd_read_block(buf, 0, 1);
+		droidboot_sd_read_block(buf, 0, 1);
 
 		/* look for the aa55 tag */
 		//if (buf[510] != 0x55 || buf[511] != 0xaa)
@@ -164,16 +164,16 @@ droidboot_error droidboot_parse_gpt_on_sd()
 		if(!gpt_partitions_exist) return DROIDBOOT_ENOENT;
 		droidboot_log(DROIDBOOT_LOG_INFO, "found GPT\n");
 
-		dridboot_sd_read_block(buf, 1, 1);
+		droidboot_sd_read_block(buf, 1, 1);
 
 		struct gpt_header gpthdr;
-		int err = partition_parse_gpt_header(buf, &gpthdr);
+		uint err = partition_parse_gpt_header(buf, &gpthdr);
 		droidboot_dump_hex(DROIDBOOT_LOG_TRACE, buf, 16);
 		if (err) {
 			/* Check the backup gpt */
 
 			uint64_t backup_header_lba = droidboot_sd_blkcnt() - 1;
-			dridboot_sd_read_block(buf, backup_header_lba , 1);
+			droidboot_sd_read_block(buf, backup_header_lba , 1);
 
 			err = partition_parse_gpt_header(buf, &gpthdr);
 			if (err) {
@@ -187,7 +187,7 @@ droidboot_error droidboot_parse_gpt_on_sd()
 		/* Read GPT Entries */
 		droidboot_log(DROIDBOOT_LOG_INFO, "Partition entries offset: %d\n", partition_0);
 		for (i = 0; i < (DROIDBOOT_ROUNDUP(gpthdr.max_partition_count, part_entry_cnt)) / part_entry_cnt; i++) {
-		    dridboot_sd_read_block(buf, 2 + i, 1);
+		    droidboot_sd_read_block(buf, 2 + i, 1);
 		    droidboot_dump_hex(DROIDBOOT_LOG_TRACE, buf, 16);
 
 			for (j = 0; j < part_entry_cnt; j++) {

lib/lvgl

@@ -93,7 +93,7 @@ void droidboot_read_mapped_file_blocks(const file_metadata *metadata, unsigned l
             // The block is within this range, calculate the actual block to read
             while (remaining_blocks > 0 && logical_block < range_blocks) {
                 unsigned long actual_block_number = range_start + logical_block;
-                dridboot_sd_read_block((void *)buffer + buffer_offset, actual_block_number + metadata->physical_partition_offset, 1);
+                droidboot_sd_read_block((void *)buffer + buffer_offset, actual_block_number + metadata->physical_partition_offset, 1);
 
                 remaining_blocks--;
                 buffer_offset += block_size;