Moved chip database to host application

Author: bbogush

firmware/Makefile

@@ -51,8 +51,8 @@ USB_SRCS=hw_config.c stm32_it.c usb_prop.c usb_desc.c usb_istr.c usb_pwr.c \
   usb_endp.c usb.c
 
 
-SRCS=main.c system_stm32f10x.c syscalls.c fsmc_nand.c chip_db.c led.c uart.c \
-  jtag.c cdc.c nand_programmer.c nand_bad_block.c $(USB_SRCS)
+SRCS=main.c system_stm32f10x.c syscalls.c fsmc_nand.c led.c uart.c jtag.c \
+  cdc.c nand_programmer.c nand_bad_block.c $(USB_SRCS)
 
 OBJS=$(addprefix $(OBJ_DIR),$(SRCS:.c=.o)) \
   $(addprefix $(OBJ_DIR),$(STARTUP:.s=.o))

firmware/chip_db.c

@@ -0,0 +1,22 @@
+/*  Copyright (C) 2017 Bogdan Bogush <[email protected]>
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 3.
+ */
+
+#ifndef _CHIP_INFO_H_
+#define _CHIP_INFO_H_
+
+typedef struct
+{
+    uint32_t page_size; /* without spare area */
+    uint32_t block_size;
+    uint32_t size;
+    uint8_t setup_time;
+    uint8_t wait_setup_time;
+    uint8_t hold_setup_time;
+    uint8_t hi_z_setup_time;
+    uint8_t clr_setup_time;
+    uint8_t ar_setup_time;
+} chip_info_t;
+
+#endif /* _CHIP_INFO_H_ */

firmware/chip_db.h

@@ -4,7 +4,6 @@
  */
 
 #include "fsmc_nand.h"
-#include "chip_db.h"
 #include <stm32f10x.h>
 
 #define FSMC_Bank_NAND     FSMC_Bank2_NAND
@@ -127,14 +126,8 @@ static void nand_fsmc_init(chip_info_t *chip_info)
     FSMC_NANDCmd(FSMC_Bank2_NAND, ENABLE);
 }
 
-void nand_init(void)
+void nand_init(chip_info_t *chip_info)
 {
-    chip_info_t *chip_info;
-
-    if (!chip_is_selected())
-        return;
-    chip_info = chip_info_selected_get();
-
     nand_gpio_init();
     nand_fsmc_init(chip_info);
 }

firmware/chip_info.h

@@ -6,6 +6,8 @@
 #ifndef _FSMC_NAND_H_
 #define _FSMC_NAND_H_
 
+#include "chip_info.h"
+
 typedef struct
 {
     uint8_t maker_id;
@@ -66,7 +68,7 @@ typedef struct
 #define ADDR_3rd_CYCLE(ADDR)       (uint8_t)(((ADDR)& 0xFF0000) >> 16)   /* 3rd addressing cycle */
 #define ADDR_4th_CYCLE(ADDR)       (uint8_t)(((ADDR)& 0xFF000000) >> 24) /* 4th addressing cycle */   
 
-void nand_init(void);
+void nand_init(chip_info_t *chip_info);
 void nand_read_id(nand_id_t *nand_id);
 uint32_t nand_write_page(uint8_t *buf, uint32_t page, uint32_t page_size);
 void nand_write_page_async(uint8_t *buf, uint32_t page, uint32_t page_size);