use device->read/write instead of using m24c32_read/write directory

Author: medamawa

middleware/src/eeprom_alloc.c

@@ -25,19 +25,16 @@ static eeprom_status_t _update_eeprom_alloc_table(eeprom_directory_t *directory,
 						  uint16_t id)
 {
 	uint16_t data_index = byte_index(id);
-	m24c32_t *device = directory->device;
 	uint16_t addr = ALLOC_TABLE_BEGIN + data_index;
 	uint8_t *data = directory->alloc_table + data_index;
 
-	return m24c32_write(device, addr, data, 1);
+	return directory->device->write(addr, data, 1);
 }
 
 eeprom_status_t _init_alloc_table(eeprom_directory_t *directory)
 {
-	m24c32_t *device = directory->device;
-
-	return m24c32_read(device, ALLOC_TABLE_BEGIN, directory->alloc_table,
-			   ALLOC_TABLE_SIZE);
+	return directory->device->read(
+		ALLOC_TABLE_BEGIN, directory->alloc_table, ALLOC_TABLE_SIZE);
 }
 
 void _print_alloc_table(eeprom_directory_t *directory)

middleware/src/eeprom_directory.c

@@ -16,7 +16,6 @@ static uint16_t *_get_ids(eeprom_directory_t *directory, const uint8_t *key)
 static eeprom_status_t _set_key(eeprom_directory_t *directory,
 				const uint8_t *key, uint16_t *ids)
 {
-	m24c32_t *device = directory->device;
 	directory_key_map_t *key_map = directory->key_map;
 
 	for (int i = 0; i < KEY_MAP_COUNT; i++) {
@@ -25,9 +24,9 @@ static eeprom_status_t _set_key(eeprom_directory_t *directory,
 			memcpy(key_map[i].ids, ids, 8);
 
 			uint16_t addr = KEY_MAP_BEGIN + i * KEY_MAP_STRUCT_SIZE;
-			return m24c32_write(device, addr,
-					    (uint8_t *)&key_map[i],
-					    KEY_MAP_STRUCT_SIZE);
+			return directory->device->write(addr,
+							(uint8_t *)&key_map[i],
+							KEY_MAP_STRUCT_SIZE);
 		}
 	}
 	return EEPROM_ERROR_ALLOCATION;
@@ -36,7 +35,6 @@ static eeprom_status_t _set_key(eeprom_directory_t *directory,
 static eeprom_status_t _delete_key(eeprom_directory_t *directory,
 				   const uint8_t *key)
 {
-	m24c32_t *device = directory->device;
 	directory_key_map_t *key_map = directory->key_map;
 
 	for (int i = 0; i < KEY_MAP_COUNT; i++) {
@@ -45,9 +43,9 @@ static eeprom_status_t _delete_key(eeprom_directory_t *directory,
 			memset(&key_map[i], 0, KEY_MAP_STRUCT_SIZE);
 
 			uint16_t addr = KEY_MAP_BEGIN + i * KEY_MAP_STRUCT_SIZE;
-			return m24c32_write(device, addr,
-					    (uint8_t *)&key_map[i],
-					    KEY_MAP_STRUCT_SIZE);
+			return directory->device->write(addr,
+							(uint8_t *)&key_map[i],
+							KEY_MAP_STRUCT_SIZE);
 		}
 	}
 	return EEPROM_ERROR_NOT_FOUND;

middleware/src/eeprom_storage.c

@@ -21,15 +21,14 @@ static uint16_t _get_addr_for_data(const uint16_t id)
 
 eeprom_status_t _init_storage(eeprom_directory_t *directory)
 {
-	m24c32_t *device = directory->device;
 	directory_key_map_t *key_map = directory->key_map;
 	uint8_t *data = malloc(KEY_MAP_SIZE);
 	if (data == NULL) {
 		return EEPROM_ERROR_ALLOCATION;
 	}
 
 	eeprom_status_t res =
-		m24c32_read(device, KEY_MAP_BEGIN, data, KEY_MAP_SIZE);
+		directory->device->read(KEY_MAP_BEGIN, data, KEY_MAP_SIZE);
 	if (res != EEPROM_OK) {
 		free(data);
 		return res;
@@ -82,8 +81,7 @@ eeprom_status_t _get_data(eeprom_directory_t *directory, const uint16_t *ids,
 		uint8_t *data_ptr = *out + BLOCK_SIZE * i;
 		eeprom_status_t res;
 
-		res = m24c32_read(directory->device, addr, data_ptr,
-				  BLOCK_SIZE);
+		res = directory->device->read(addr, data_ptr, BLOCK_SIZE);
 		if (res != EEPROM_OK) {
 			free(*out);
 			*out = NULL;
@@ -122,8 +120,8 @@ eeprom_status_t _put_data(eeprom_directory_t *directory, const uint16_t *ids,
 		}
 
 		// Write the entire block (BLOCK_SIZE bytes) to EEPROM
-		eeprom_status_t res = m24c32_write(directory->device, addr,
-						   block_buffer, BLOCK_SIZE);
+		eeprom_status_t res = directory->device->write(
+			addr, block_buffer, BLOCK_SIZE);
 		if (res != EEPROM_OK) {
 			free(block_buffer);
 			return res;