X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fsd.c;h=a16e729957df79e61dcd8f500848656a2af5df91;hb=5579f0a02cd782e3df7849e2f84640bd1160e232;hp=e6ca8f93f86775f0968e326733197586c4e8451d;hpb=8c2dd767cd261032e454010c7f88f1aa36dce67c;p=bertos.git

diff --git a/bertos/drv/sd.c b/bertos/drv/sd.c
index e6ca8f93..a16e7299 100644
--- a/bertos/drv/sd.c
+++ b/bertos/drv/sd.c
@@ -413,7 +413,7 @@ static const KBlockVTable sd_buffered_vt =
 #define SD_SEND_OP_COND_CRC  0xF9
 
 #define SD_START_DELAY  10
-#define SD_INIT_TIMEOUT 1000
+#define SD_INIT_TIMEOUT ms_to_ticks(2000)
 #define SD_IDLE_RETRIES 4
 
 static bool sd_blockInit(Sd *sd, KFile *ch)
@@ -500,6 +500,606 @@ static bool sd_blockInit(Sd *sd, KFile *ch)
 	return true;
 }
 
+#if CPU_CM3_SAM3X8
+
+#include <drv/hsmci_sam3.h>
+
+/* SD commands                           type  argument     response */
+  /* class 0 */
+/* This is basically the same command as for MMC with some quirks. */
+#define SD_SEND_RELATIVE_ADDR     3   /* bcr                     R6  */
+#define SD_SEND_IF_COND           8   /* bcr  [11:0] See below   R7  */
+#define SD_SWITCH_VOLTAGE         11  /* ac                      R1  */
+
+  /* class 10 */
+#define SD_SWITCH                 6   /* adtc [31:0] See below   R1  */
+
+  /* class 5 */
+#define SD_ERASE_WR_BLK_START    32   /* ac   [31:0] data addr   R1  */
+#define SD_ERASE_WR_BLK_END      33   /* ac   [31:0] data addr   R1  */
+
+  /* Application commands */
+#define SD_APP_SET_BUS_WIDTH      6   /* ac   [1:0] bus width    R1  */
+#define SD_APP_SD_STATUS         13   /* adtc                    R1  */
+#define SD_APP_SEND_NUM_WR_BLKS  22   /* adtc                    R1  */
+#define SD_APP_OP_COND           41   /* bcr  [31:0] OCR         R3  */
+#define SD_APP_SEND_SCR          51   /* adtc                    R1  */
+
+/* OCR bit definitions */
+#define SD_OCR_S18R     (1 << 24)    /* 1.8V switching request */
+#define SD_ROCR_S18A        SD_OCR_S18R  /* 1.8V switching accepted by card */
+#define SD_OCR_XPC      (1 << 28)    /* SDXC power control */
+
+/*
+ * SD_SWITCH argument format:
+ *
+ *      [31] Check (0) or switch (1)
+ *      [30:24] Reserved (0)
+ *      [23:20] Function group 6
+ *      [19:16] Function group 5
+ *      [15:12] Function group 4
+ *      [11:8] Function group 3
+ *      [7:4] Function group 2
+ *      [3:0] Function group 1
+ */
+
+/*
+ * SD_SEND_IF_COND argument format:
+ *
+ *  [31:12] Reserved (0)
+ *  [11:8] Host Voltage Supply Flags
+ *  [7:0] Check Pattern (0xAA)
+ */
+
+/*
+ * SCR field definitions
+ */
+
+#define SCR_SPEC_VER_0      0   /* Implements system specification 1.0 - 1.01 */
+#define SCR_SPEC_VER_1      1   /* Implements system specification 1.10 */
+#define SCR_SPEC_VER_2      2   /* Implements system specification 2.00-3.0X */
+
+#define UNSTUFF_BITS(resp, start, size)                   \
+    ({                              \
+        const uint32_t __size = size;                \
+        const uint32_t __mask = (__size < 32 ? 1 << __size : 0) - 1; \
+        const uint32_t __off = 3 - ((start) / 32);           \
+        const uint32_t __shft = (start) & 31;            \
+        uint32_t __res;                      \
+                                    \
+        __res = resp[__off] >> __shft;              \
+        if (__size + __shft > 32)               \
+            __res |= resp[__off-1] << ((32 - __shft) % 32); \
+        __res & __mask;                     \
+    })
+
+
+#define SD_ADDR_TO_RCA(addr)    (uint32_t)(((addr) << 16) & 0xFFFF0000)
+
+#define BCD_TO_INT_32BIT(bcd)  ((uint32_t )((bcd) & 0xf) * 1 +  \
+								(((bcd) >> 4) & 0xf)  * 10 +      \
+								(((bcd) >> 8) & 0xf)  * 100 +     \
+								(((bcd) >> 12) & 0xf) * 1000 +   \
+								(((bcd) >> 16) & 0xf) * 10000 +   \
+								(((bcd) >> 20) & 0xf) * 100000 +  \
+								(((bcd) >> 24) & 0xf) * 1000000 + \
+								(((bcd) >> 28) & 0xf) * 10000000) \
+
+LOG_INFOB(
+static void dump(const char *label, uint32_t *r, size_t len)
+{
+	ASSERT(r);
+	size_t i;
+	int j = 0;
+	kprintf("\n%s [\n", label);
+	for (i = 0; i < len; i++)
+	{
+		if (j == 5)
+		{
+			kputs("\n");
+			j = 0;
+		}
+		kprintf("%08lx", r[i]);
+		j++;
+	}
+	kprintf("\n] len=%d\n\n", i);
+}
+)
+
+static const uint32_t tran_exp[] = {
+    10000,      100000,     1000000,    10000000,
+    0,      0,      0,      0
+};
+
+static const uint8_t tran_mant[] = {
+    0,  10, 12, 13, 15, 20, 25, 30,
+    35, 40, 45, 50, 55, 60, 70, 80,
+};
+
+static int sd_decodeCsd(SDcsd *csd, uint32_t *resp, size_t len)
+{
+	ASSERT(csd);
+	ASSERT(resp);
+	ASSERT(len >= 4);
+
+    csd->structure = UNSTUFF_BITS(resp, 126, 2);
+	csd->ccc = UNSTUFF_BITS(resp, 84, 12);
+
+    csd->max_data_rate  = tran_exp[UNSTUFF_BITS(resp, 96, 3)] * tran_mant[UNSTUFF_BITS(resp, 99, 4)];
+
+	/*
+	 * CSD structure:
+	 * - 0:
+	 * 		- Version 1.01-1.10
+	 * 		- Version 2.00/Standard Capacity
+	 * - 1:
+	 * 		- Version 2.00/High Capacity
+	 * - >1: not defined.
+	 */
+
+    if (csd->structure == 0)
+	{
+		// (C_size + 1) x 2^(C_SIZE_MUL+2)
+		csd->blk_num = (1 + UNSTUFF_BITS(resp, 62, 12)) << (UNSTUFF_BITS(resp, 47, 3) + 2);
+
+		csd->read_blk_bits = UNSTUFF_BITS(resp, 80, 4);
+		csd->write_blk_bits = UNSTUFF_BITS(resp, 22, 4);
+
+		csd->blk_len = 1 << csd->read_blk_bits;
+        csd->capacity  = csd->blk_num * csd->blk_len;
+
+        csd->read_partial = UNSTUFF_BITS(resp, 79, 1);
+        csd->read_misalign = UNSTUFF_BITS(resp, 77, 1);
+
+        csd->write_misalign = UNSTUFF_BITS(resp, 78, 1);
+        csd->write_partial = UNSTUFF_BITS(resp, 21, 1);
+
+        if (UNSTUFF_BITS(resp, 46, 1))
+		{
+            csd->erase_size = 1;
+        }
+		else if(csd->write_blk_bits >= 9)
+		{
+            csd->erase_size = UNSTUFF_BITS(resp, 39, 7) + 1;
+            csd->erase_size <<= csd->write_blk_bits - 9;
+        }
+
+		return 0;
+	}
+	else if (csd->structure == 1)
+	{
+		kprintf("csize %ld\n", UNSTUFF_BITS(resp, 48, 22));
+        csd->capacity  = (1 + UNSTUFF_BITS(resp, 48, 22)) << 10;
+
+		csd->write_blk_bits = 9;
+		csd->write_partial = 0;
+        csd->write_misalign = 0;
+
+		csd->read_blk_bits = 9;
+		csd->read_partial = 0;
+        csd->read_misalign = 0;
+
+        csd->erase_size = 1;
+		// the block size if fixed to 512kb
+		csd->blk_len = (1 << csd->write_blk_bits) << 10;
+
+        return 0;
+	}
+    else
+	{
+        kprintf("Unrecognised CSD structure version %d\n", csd->structure);
+        return -1;
+    }
+
+    return 0;
+}
+
+
+void sd_dumpCsd(Sd *sd)
+{
+	ASSERT(sd);
+
+	LOG_INFO("VERSION: %d.0\n", sd->csd.structure ? 2 : 1);
+    LOG_INFO("CARD COMMAND CLASS: %d\n", sd->csd.ccc);
+	LOG_INFO("MAX DATA RATE: %ld\n", sd->csd.max_data_rate);
+	LOG_INFO("WRITE BLK LEN BITS: %ld\n", sd->csd.write_blk_bits);
+	LOG_INFO("READ BLK LEN BITS: %ld\n", sd->csd.read_blk_bits);
+	LOG_INFO("ERASE SIZE: %ld\n", sd->csd.erase_size);
+	LOG_INFO("BLK NUM: %ld\n", sd->csd.blk_num);
+	LOG_INFO("BLK LEN: %ld\n", sd->csd.blk_len);
+	LOG_INFO("CAPACITY %ld\n", sd->csd.capacity);
+	LOG_INFO("FLAG Write: WP %d, W MISALIGN %d\n", sd->csd.write_partial, sd->csd.write_misalign);
+	LOG_INFO("FLAG Read: RP %d, R MISALIGN %d\n", sd->csd.read_partial, sd->csd.read_misalign);
+
+}
+
+void sd_dumpCid(Sd *sd)
+{
+	ASSERT(sd);
+
+	LOG_INFO("MANFID: %d\n", sd->cid.manfid);
+    LOG_INFO("OEMID: %d\n", sd->cid.oemid);
+	LOG_INFO("SERIAL: %ld\n", sd->cid.serial);
+    LOG_INFO("PROD_NAME: %s\n", sd->cid.prod_name);
+    LOG_INFO("REV: %d.%d\n", sd->cid.m_rev, sd->cid.l_rev);
+    LOG_INFO("OFF,Y,M: %lx, %ld %ld\n", sd->cid.year_off, (BCD_TO_INT_32BIT(sd->cid.year_off) / 12) + 2000,
+												(BCD_TO_INT_32BIT(sd->cid.year_off) % 12));
+}
+
+void sd_dumpSsr(Sd *sd)
+{
+	ASSERT(sd);
+
+	LOG_INFO("BUS_WIDTH: %d\n", sd->ssr.bus_width);
+    LOG_INFO("TYPE: %d\n", sd->ssr.card_type);
+	LOG_INFO("AU_TYPE: %d\n", sd->ssr.au_size);
+	LOG_INFO("ERASE_SIZE: %d\n", sd->ssr.erase_size);
+	LOG_INFO("SPEED_CLASS: %d\n", sd->ssr.speed_class);
+}
+
+
+void sd_sendInit(void)
+{
+	hsmci_init(NULL); //TODO: REMOVE IT!
+
+	if (hsmci_sendCmd(0, 0, HSMCI_CMDR_SPCMD_INIT | HSMCI_CMDR_RSPTYP_NORESP))
+		LOG_ERR("INIT: %lx\n", HSMCI_SR);
+}
+
+
+void sd_goIdle(void)
+{
+	hsmci_setSpeed(HSMCI_INIT_SPEED, false);
+	if (hsmci_sendCmd(0, 0, HSMCI_CMDR_RSPTYP_NORESP))
+		LOG_ERR("GO_IDLE: %lx\n", HSMCI_SR);
+}
+
+int sd_sendIfCond(void)
+{
+	if (hsmci_sendCmd(8, CMD8_V_RANGE_27V_36V, HSMCI_CMDR_RSPTYP_48_BIT))
+	{
+		LOG_ERR("IF_COND %lx\n", HSMCI_SR);
+		return -1;
+	}
+	else
+	{
+		uint32_t r = HSMCI_RSPR;
+		if ((r & 0xFFF) == CMD8_V_RANGE_27V_36V)
+		{
+			LOG_INFO("IF_COND: %lx\n", r);
+			return 0;
+		}
+		LOG_ERR("IF_COND: %lx\n", r);
+	}
+	return -1;
+}
+
+int sd_sendAppOpCond(void)
+{
+	if (hsmci_sendCmd(55, 0, HSMCI_CMDR_RSPTYP_48_BIT))
+	{
+		LOG_ERR("APP_CMD %lx\n", HSMCI_SR);
+		return -1;
+	}
+	else
+	{
+		LOG_INFO("APP_CMD %lx\n", HSMCI_RSPR);
+	}
+
+	if (hsmci_sendCmd(41, SD_HOST_VOLTAGE_RANGE | SD_OCR_CCS, HSMCI_CMDR_RSPTYP_48_BIT))// se cmd 8 va ok.
+	{
+		LOG_ERR("APP_OP_COND %lx\n", HSMCI_SR);
+		return -1;
+	}
+	else
+	{
+		uint32_t status = HSMCI_RSPR;
+		if (status & SD_OCR_BUSY)
+		{
+			LOG_INFO("SD power up! Hight Capability [%d]\n", (bool)(status & SD_OCR_CCS));
+			return 0;
+		}
+
+		LOG_ERR("sd not ready.\n");
+	}
+
+	return -1;
+}
+
+
+int sd_getCid(Sd *sd, uint32_t addr, uint8_t flag)
+{
+	ASSERT(sd);
+	memset(&(sd->cid), 0, sizeof(SDcid));
+
+	uint8_t idx = 9; // CMD9 get cid from gived sd address (RCA)
+	if (flag & SD_SEND_ALL_CID)
+		idx = 2;
+
+
+	if (hsmci_sendCmd(idx, SD_ADDR_TO_RCA(addr), HSMCI_CMDR_RSPTYP_136_BIT))
+	{
+		LOG_ERR("GET_CID %lx\n", HSMCI_SR);
+		return -1;
+	}
+	else
+	{
+		uint32_t resp[4];
+		hsmci_readResp(resp, 4);
+		LOG_INFOB(dump("CID", resp, 4););
+
+		sd->cid.manfid        = UNSTUFF_BITS(resp, 120, 8);
+		sd->cid.oemid         = UNSTUFF_BITS(resp, 104, 16);
+		sd->cid.prod_name[0]      = UNSTUFF_BITS(resp, 96, 8);
+		sd->cid.prod_name[1]      = UNSTUFF_BITS(resp, 88, 8);
+		sd->cid.prod_name[2]      = UNSTUFF_BITS(resp, 80, 8);
+		sd->cid.prod_name[3]      = UNSTUFF_BITS(resp, 72, 8);
+		sd->cid.prod_name[4]      = UNSTUFF_BITS(resp, 64, 8);
+		sd->cid.m_rev         = UNSTUFF_BITS(resp, 60, 4);
+		sd->cid.l_rev         = UNSTUFF_BITS(resp, 56, 4);
+		sd->cid.serial        = (uint32_t)UNSTUFF_BITS(resp, 24, 32);
+		sd->cid.year_off      = UNSTUFF_BITS(resp, 8, 12);
+	}
+
+	return 0;
+}
+
+int sd_getCsd(Sd *sd)
+{
+	ASSERT(sd);
+	memset(&(sd->csd), 0, sizeof(SDcsd));
+
+	LOG_INFO("Send to RCA: %lx\n", SD_ADDR_TO_RCA(sd->addr));
+	if (hsmci_sendCmd(9, SD_ADDR_TO_RCA(sd->addr), HSMCI_CMDR_RSPTYP_136_BIT))
+	{
+		LOG_ERR("GET_CSD %lx\n", HSMCI_SR);
+		return -1;
+	}
+	else
+	{
+		uint32_t resp[4];
+		hsmci_readResp(resp, 4);
+		LOG_INFOB(dump("CSD", resp, 4););
+		sd_decodeCsd(&(sd->csd), resp, 4);
+	}
+
+	return 0;
+}
+
+int sd_getRelativeAddr(Sd *sd)
+{
+	ASSERT(sd);
+	if (hsmci_sendCmd(3, 0, HSMCI_CMDR_RSPTYP_48_BIT))
+	{
+		LOG_ERR("RCA: %lx\n", HSMCI_SR);
+		return -1;
+	}
+
+	hsmci_readResp(&sd->addr, 1);
+	sd->addr = sd->addr >> 16;
+
+	LOG_INFOB(dump("RCA", &sd->addr, 1););
+
+	return 0;
+}
+
+#define SD_STATUS_APP_CMD      BV(5)
+#define SD_STATUS_READY        BV(8)
+#define SD_STATUS_CURR_MASK    0x1E00
+#define SD_STATUS_CURR_SHIFT   9
+
+#define SD_GET_STATE(status)    (uint8_t)(((status) & SD_STATUS_CURR_MASK) >> SD_STATUS_CURR_SHIFT)
+
+int sd_appStatus(Sd *sd)
+{
+	ASSERT(sd);
+	LOG_INFO("Send to RCA: %lx\n", SD_ADDR_TO_RCA(sd->addr));
+	if (hsmci_sendCmd(13, SD_ADDR_TO_RCA(sd->addr), HSMCI_CMDR_RSPTYP_48_BIT))
+	{
+		LOG_ERR("STATUS: %lx\n", HSMCI_SR);
+		return -1;
+	}
+
+	hsmci_readResp(&(sd->status), 1);
+	LOG_INFOB(dump("STATUS", &(sd->status), 1););
+
+	LOG_INFO("State[%d]\n", SD_GET_STATE(sd->status));
+
+	if (sd->status & SD_STATUS_READY)
+		return 0;
+
+	return -1;
+}
+
+
+INLINE int sd_cardSelection(Sd *sd, size_t rca)
+{
+	ASSERT(sd);
+	LOG_INFO("Select RCA: %lx\n", SD_ADDR_TO_RCA(sd->addr));
+	if (hsmci_sendCmd(7, rca, HSMCI_CMDR_RSPTYP_R1B))
+	{
+		LOG_ERR("SELECT_SD: %lx\n", HSMCI_SR);
+		return -1;
+	}
+
+	HSMCI_CHECK_BUSY();
+	hsmci_readResp(&(sd->status), 1);
+	LOG_INFOB(dump("SELECT_SD", &(sd->status), 1););
+
+	LOG_INFO("State[%d]\n", SD_GET_STATE(sd->status));
+
+	if (sd->status & SD_STATUS_READY)
+		return 0;
+
+	return -1;
+}
+
+int sd_selectCard(Sd *sd)
+{
+	return sd_cardSelection(sd, SD_ADDR_TO_RCA(sd->addr));
+}
+
+int sd_deSelectCard(Sd *sd)
+{
+	uint32_t rca = 0;
+	if (!sd->addr)
+		rca = SD_ADDR_TO_RCA(sd->addr + 1);
+
+	return sd_cardSelection(sd, rca);
+}
+
+
+int sd_setBusWidth(Sd *sd, size_t len)
+{
+	ASSERT(sd);
+
+	if (hsmci_sendCmd(55, SD_ADDR_TO_RCA(sd->addr), HSMCI_CMDR_RSPTYP_48_BIT))
+	{
+		LOG_ERR("APP_CMD %lx\n", HSMCI_SR);
+		return -1;
+	}
+
+	uint32_t status = HSMCI_RSPR;
+	if (status & (SD_STATUS_APP_CMD | SD_STATUS_READY))
+	{
+		hsmci_setBusWidth(len);
+
+		uint8_t arg = 0;
+		if (len == 4)
+			arg = 2;
+
+		if (hsmci_sendCmd(6, arg, HSMCI_CMDR_RSPTYP_48_BIT))
+		{
+			LOG_ERR("SET_BUS_WIDTH CMD: %lx\n", HSMCI_SR);
+			return -1;
+		}
+
+		hsmci_readResp(&(sd->status), 1);
+
+		LOG_INFOB(dump("SET_BUS_WIDTH", &(sd->status), 1););
+		LOG_INFO("State[%d]\n", SD_GET_STATE(sd->status));
+
+		if (sd->status & SD_STATUS_READY)
+			return 0;
+	}
+
+	LOG_ERR("SET_BUS_WIDTH REP %lx\n", status);
+	return -1;
+}
+
+
+int sd_set_BlockLen(Sd *sd, size_t len)
+{
+	ASSERT(sd);
+
+	if (hsmci_sendCmd(16, len, HSMCI_CMDR_RSPTYP_48_BIT))
+	{
+		LOG_ERR("SET_BLK_LEN: %lx\n", HSMCI_SR);
+		return -1;
+	}
+
+	hsmci_readResp(&(sd->status), 1);
+
+	LOG_INFOB(dump("SET_BLK_LEN", &(sd->status), 1););
+	LOG_INFO("State[%d]\n", SD_GET_STATE(sd->status));
+
+	sd->csd.blk_len = len;
+
+	if (sd->status & SD_STATUS_READY)
+		return 0;
+
+	return -1;
+}
+
+int sd_getStatus(Sd *sd, uint32_t *buf, size_t words)
+{
+	ASSERT(sd);
+
+	// Status reply with 512bit data, so the block size in byte is 64
+	hsmci_prgRxDMA(buf, words, 64);
+
+	if (hsmci_sendCmd(55, SD_ADDR_TO_RCA(sd->addr), HSMCI_CMDR_RSPTYP_48_BIT))
+	{
+		LOG_ERR("APP_CMD %lx\n", HSMCI_SR);
+		return -1;
+	}
+
+	uint32_t status = HSMCI_RSPR;
+	if (status & (SD_STATUS_APP_CMD | SD_STATUS_READY))
+	{
+		if (hsmci_sendCmd(13, 0, HSMCI_CMDR_RSPTYP_48_BIT |
+				BV(HSMCI_CMDR_TRDIR) | HSMCI_CMDR_TRCMD_START_DATA | HSMCI_CMDR_TRTYP_SINGLE))
+		{
+			LOG_ERR("STATUS CMD: %lx\n", HSMCI_SR);
+			return -1;
+		}
+
+		hsmci_readResp(&(sd->status), 1);
+		LOG_INFOB(dump("STATUS", &(sd->status), 1););
+		LOG_INFO("State[%d]\n", SD_GET_STATE(sd->status));
+
+		if (sd->status & SD_STATUS_READY)
+		{
+			hsmci_waitTransfer();
+
+			LOG_INFOB(dump("STATUS", buf, words););
+			memset(&(sd->ssr), 0, sizeof(SDssr));
+
+			sd->ssr.bus_width  = UNSTUFF_BITS(buf, 510, 2);
+			sd->ssr.card_type  = UNSTUFF_BITS(buf, 480, 16);
+			sd->ssr.au_size  = UNSTUFF_BITS(buf, 432, 8);
+			sd->ssr.speed_class  = UNSTUFF_BITS(buf, 440, 8);
+			sd->ssr.erase_size = UNSTUFF_BITS(buf, 408, 24);
+
+			return 0;
+		}
+	}
+
+	return -1;
+}
+
+
+
+int sd_readSingleBlock(Sd *sd, size_t index, uint32_t *buf, size_t words)
+{
+	ASSERT(sd);
+	ASSERT(buf);
+
+	hsmci_prgRxDMA(buf, words, sd->csd.blk_len);
+
+	if (hsmci_sendCmd(17, index * sd->csd.blk_len, HSMCI_CMDR_RSPTYP_48_BIT |
+			BV(HSMCI_CMDR_TRDIR) | HSMCI_CMDR_TRCMD_START_DATA | HSMCI_CMDR_TRTYP_SINGLE))
+	{
+		LOG_ERR("SIGLE_BLK_READ: %lx\n", HSMCI_SR);
+		return -1;
+	}
+	hsmci_readResp(&(sd->status), 1);
+
+	LOG_INFOB(dump("SIGLE_BLK_READ", &(sd->status), 1););
+	LOG_INFO("State[%d]\n", SD_GET_STATE(sd->status));
+
+	if (sd->status & SD_STATUS_READY)
+	{
+		hsmci_waitTransfer();
+		LOG_INFOB(dump("BLK", buf, words););
+
+		return words;
+	}
+
+	return -1;
+}
+
+
+
+void sd_setHightSpeed(Sd *sd)
+{
+	hsmci_setSpeed(2100000, true);
+}
+
+
+#endif
+
+
 bool sd_initUnbuf(Sd *sd, KFile *ch)
 {
 	if (sd_blockInit(sd, ch))
@@ -527,3 +1127,5 @@ bool sd_initBuf(Sd *sd, KFile *ch)
 		return false;
 }
 
+
+