jzh/free-dap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17 from ooxi/patch/hal-config-2

Browse Source 
Centralized pin configuration
This commit is contained in:
Alex Taradov 2021-04-12 10:14:31 -07:00 committed by GitHub
commit 55ff181c20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 60 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/samd11_vcp/dap_config.h
View File

@ -31,13 +31,9 @@
/*- Includes ----------------------------------------------------------------*/
#include "samd11.h"
#include "hal_gpio.h"
#include "hal_config.h"
/*- Definitions -------------------------------------------------------------*/
HAL_GPIO_PIN(SWCLK_TCK, A, 14)
HAL_GPIO_PIN(SWDIO_TMS, A, 15)
HAL_GPIO_PIN(nRESET, A, 9)
#define DAP_CONFIG_ENABLE_SWD
//#define DAP_CONFIG_ENABLE_JTAG

57
platform/samd11_vcp/hal_config.h Normal file
View File

@ -0,0 +1,57 @@
/*
* Copyright (c) 2021, Alex Taradov <alex@taradov.com>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _HAL_CONFIG_H_
#define _HAL_CONFIG_H_
/*- Includes ----------------------------------------------------------------*/
#include "hal_gpio.h"
/*- Definitions -------------------------------------------------------------*/
HAL_GPIO_PIN(SWCLK_TCK, A, 14)
HAL_GPIO_PIN(SWDIO_TMS, A, 15)
HAL_GPIO_PIN(nRESET, A, 9)
HAL_GPIO_PIN(VCP_STATUS, A, 2);
HAL_GPIO_PIN(DAP_STATUS, A, 4);
HAL_GPIO_PIN(BOOT_ENTER, A, 31);
HAL_GPIO_PIN(UART_TX, A, 8);
HAL_GPIO_PIN(UART_RX, A, 5);
#define UART_SERCOM SERCOM0
#define UART_SERCOM_PMUX PORT_PMUX_PMUXE_D_Val
#define UART_SERCOM_GCLK_ID SERCOM0_GCLK_ID_CORE
#define UART_SERCOM_APBCMASK PM_APBCMASK_SERCOM0
#define UART_SERCOM_IRQ_INDEX SERCOM0_IRQn
#define UART_SERCOM_IRQ_HANDLER irq_handler_sercom0
#define UART_SERCOM_TXPO 1
#define UART_SERCOM_RXPO 1
#endif // _HAL_CONFIG_H_

6
platform/samd11_vcp/main.c
View File

@ -33,7 +33,7 @@
#include <stdalign.h>
#include <string.h>
#include "samd11.h"
#include "hal_gpio.h"
#include "hal_config.h"
#include "nvm_data.h"
#include "usb.h"
#include "uart.h"
@ -45,10 +45,6 @@
#define UART_WAIT_TIMEOUT 10 // ms
#define STATUS_TIMEOUT 250 // ms
HAL_GPIO_PIN(VCP_STATUS, A, 2);
HAL_GPIO_PIN(DAP_STATUS, A, 4);
HAL_GPIO_PIN(BOOT_ENTER, A, 31);
/*- Variables ---------------------------------------------------------------*/
static alignas(4) uint8_t app_request_buffer[DAP_CONFIG_PACKET_SIZE];
static alignas(4) uint8_t app_response_buffer[DAP_CONFIG_PACKET_SIZE];

14
platform/samd11_vcp/uart.c
View File

@ -33,25 +33,13 @@
#include <stdbool.h>
#include <string.h>
#include "samd11.h"
#include "hal_gpio.h"
#include "hal_config.h"
#include "uart.h"
#include "usb_cdc.h"
/*- Definitions -------------------------------------------------------------*/
#define UART_BUF_SIZE 256
HAL_GPIO_PIN(UART_TX, A, 8);
HAL_GPIO_PIN(UART_RX, A, 5);
#define UART_SERCOM SERCOM0
#define UART_SERCOM_PMUX PORT_PMUX_PMUXE_D_Val
#define UART_SERCOM_GCLK_ID SERCOM0_GCLK_ID_CORE
#define UART_SERCOM_APBCMASK PM_APBCMASK_SERCOM0
#define UART_SERCOM_IRQ_INDEX SERCOM0_IRQn
#define UART_SERCOM_IRQ_HANDLER irq_handler_sercom0
#define UART_SERCOM_TXPO 1
#define UART_SERCOM_RXPO 1
/*- Types ------------------------------------------------------------------*/
typedef struct
{