Merge pull request #66 from hathach/develop

support makefile device example for all boards

5 files changed, 9 insertions, 9 deletions

diff --git a/src/device/dcd.h b/src/device/dcd.h
index 18678f15b..35164ac62 100644
--- a/src/device/dcd.h
+++ b/src/device/dcd.h
@@ -1,7 +1,7 @@
 /* 

  * The MIT License (MIT)

  *

- * Copyright (c) 2018, hathach (tinyusb.org)

+ * Copyright (c) 2019 Ha Thach (tinyusb.org)

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy

  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/device/usbd.c b/src/device/usbd.c
index 6e3a1e1ca..56d895388 100644
--- a/src/device/usbd.c
+++ b/src/device/usbd.c
@@ -1,7 +1,7 @@
 /* 

  * The MIT License (MIT)

  *

- * Copyright (c) 2018, hathach (tinyusb.org)

+ * Copyright (c) 2019 Ha Thach (tinyusb.org)

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy

  * of this software and associated documentation files (the "Software"), to deal

@@ -382,7 +382,7 @@ static bool process_control_request(uint8_t rhport, tusb_control_request_t const
         break;

 

         case TUSB_REQ_GET_DESCRIPTOR:

-          TU_ASSERT( process_get_descriptor(rhport, p_request) );

+          TU_VERIFY( process_get_descriptor(rhport, p_request) );

         break;

 

         case TUSB_REQ_SET_FEATURE:

@@ -739,7 +739,7 @@ void usbd_edpt_stall(uint8_t rhport, uint8_t ep_addr)
   uint8_t const dir   = tu_edpt_dir(ep_addr);

 

   dcd_edpt_stall(rhport, ep_addr);

-  _usbd_dev.ep_stall_mask[dir] = tu_bit_set(_usbd_dev.ep_stall_mask[dir], epnum);

+  _usbd_dev.ep_stall_mask[dir] = (uint8_t) tu_bit_set(_usbd_dev.ep_stall_mask[dir], epnum);

 }

 

 void usbd_edpt_clear_stall(uint8_t rhport, uint8_t ep_addr)

@@ -748,7 +748,7 @@ void usbd_edpt_clear_stall(uint8_t rhport, uint8_t ep_addr)
   uint8_t const dir   = tu_edpt_dir(ep_addr);

 

   dcd_edpt_clear_stall(rhport, ep_addr);

-  _usbd_dev.ep_stall_mask[dir] = tu_bit_clear(_usbd_dev.ep_stall_mask[dir], epnum);

+  _usbd_dev.ep_stall_mask[dir] = (uint8_t) tu_bit_clear(_usbd_dev.ep_stall_mask[dir], epnum);

 }

 

 bool usbd_edpt_stalled(uint8_t rhport, uint8_t ep_addr)

diff --git a/src/device/usbd.h b/src/device/usbd.h
index 2e34b25ac..46143a215 100644
--- a/src/device/usbd.h
+++ b/src/device/usbd.h
@@ -1,7 +1,7 @@
 /* 

  * The MIT License (MIT)

  *

- * Copyright (c) 2018, hathach (tinyusb.org)

+ * Copyright (c) 2019 Ha Thach (tinyusb.org)

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy

  * of this software and associated documentation files (the "Software"), to deal

@@ -94,7 +94,7 @@ ATTR_WEAK void tud_resume_cb(void);
 

 #define TUD_CONFIG_DESC_LEN   (9)

 

-// Inteface count, string index, total length, attribute, power in mA

+// Interface count, string index, total length, attribute, power in mA

 #define TUD_CONFIG_DESCRIPTOR(_itfcount, _stridx, _total_len, _attribute, _power_ma) \

   9, TUSB_DESC_CONFIGURATION, U16_TO_U8S_LE(_total_len), _itfcount, 1, _stridx, TU_BIT(7) | _attribute, (_power_ma)/2

 

diff --git a/src/device/usbd_control.c b/src/device/usbd_control.c
index 0b878fbcb..1b5ee9f91 100644
--- a/src/device/usbd_control.c
+++ b/src/device/usbd_control.c
@@ -1,7 +1,7 @@
 /* 

  * The MIT License (MIT)

  *

- * Copyright (c) 2018, hathach (tinyusb.org)

+ * Copyright (c) 2019 Ha Thach (tinyusb.org)

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy

  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/device/usbd_pvt.h b/src/device/usbd_pvt.h
index fb3672359..f20532627 100644
--- a/src/device/usbd_pvt.h
+++ b/src/device/usbd_pvt.h
@@ -1,7 +1,7 @@
 /* 
  * The MIT License (MIT)
  *
- * Copyright (c) 2018, hathach (tinyusb.org)
+ * Copyright (c) 2019 Ha Thach (tinyusb.org)
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal