Browse Source

Some `MIN`/`MAX` rely on core

pull/1/head
Scott Lahteine 5 years ago
parent
commit
253d0f9671
  1. 2
      Marlin/src/HAL/HAL_DUE/usb/uotghs_device_due.c
  2. 2
      Marlin/src/HAL/HAL_DUE/usb/uotghs_device_due.h

2
Marlin/src/HAL/HAL_DUE/usb/uotghs_device_due.c

@ -1904,7 +1904,7 @@ static void udd_ep_in_sent(udd_ep_id_t ep)
ptr_src = &ptr_job->buf[ptr_job->buf_cnt]; ptr_src = &ptr_job->buf[ptr_job->buf_cnt];
nb_remain = ptr_job->buf_size - ptr_job->buf_cnt; nb_remain = ptr_job->buf_size - ptr_job->buf_cnt;
// Fill a bank even if no data (ZLP) // Fill a bank even if no data (ZLP)
nb_data = _MIN(nb_remain, pkt_size); nb_data = MIN(nb_remain, pkt_size);
// Modify job information // Modify job information
ptr_job->buf_cnt += nb_data; ptr_job->buf_cnt += nb_data;
ptr_job->buf_load = nb_data; ptr_job->buf_load = nb_data;

2
Marlin/src/HAL/HAL_DUE/usb/uotghs_device_due.h

@ -291,7 +291,7 @@ extern "C" {
//! available greater size, then applies register format of UOTGHS controller //! available greater size, then applies register format of UOTGHS controller
//! for endpoint size bit-field. //! for endpoint size bit-field.
#undef udd_format_endpoint_size #undef udd_format_endpoint_size
#define udd_format_endpoint_size(size) (32 - clz(((uint32_t)_MIN(_MAX(size, 8), 1024) << 1) - 1) - 1 - 3) #define udd_format_endpoint_size(size) (32 - clz(((uint32_t)MIN(MAX(size, 8), 1024) << 1) - 1) - 1 - 3)
//! Configures the selected endpoint size //! Configures the selected endpoint size
#define udd_configure_endpoint_size(ep, size) (Wr_bitfield(UOTGHS_ARRAY(UOTGHS_DEVEPTCFG[0], ep), UOTGHS_DEVEPTCFG_EPSIZE_Msk, udd_format_endpoint_size(size))) #define udd_configure_endpoint_size(ep, size) (Wr_bitfield(UOTGHS_ARRAY(UOTGHS_DEVEPTCFG[0], ep), UOTGHS_DEVEPTCFG_EPSIZE_Msk, udd_format_endpoint_size(size)))
//! Gets the configured selected endpoint size //! Gets the configured selected endpoint size

Loading…
Cancel
Save