Merge pull request #66 from hathach/develop

support makefile device example for all boards

8 files changed, 11 insertions, 11 deletions

diff --git a/src/class/cdc/cdc.h b/src/class/cdc/cdc.h
index a764f15d2..200f6eaae 100644
--- a/src/class/cdc/cdc.h
+++ b/src/class/cdc/cdc.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/class/cdc/cdc_device.c b/src/class/cdc/cdc_device.c
index 7a0380e6b..81ce2e432 100644
--- a/src/class/cdc/cdc_device.c
+++ b/src/class/cdc/cdc_device.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

@@ -99,7 +99,7 @@ static void _prep_out_transaction (uint8_t itf)
 bool tud_cdc_n_connected(uint8_t itf)

 {

   // DTR (bit 0) active  is considered as connected

-  return tud_ready() && TU_BIT_TEST(_cdcd_itf[itf].line_state, 0);

+  return tud_ready() && tu_bit_test(_cdcd_itf[itf].line_state, 0);

 }

 

 uint8_t tud_cdc_n_get_line_state (uint8_t itf)

@@ -358,7 +358,7 @@ bool cdcd_control_request(uint8_t rhport, tusb_control_request_t const * request
       usbd_control_status(rhport, request);

 

       // Invoke callback

-      if ( tud_cdc_line_state_cb) tud_cdc_line_state_cb(itf, TU_BIT_TEST(request->wValue, 0), TU_BIT_TEST(request->wValue, 1));

+      if ( tud_cdc_line_state_cb) tud_cdc_line_state_cb(itf, tu_bit_test(request->wValue, 0), tu_bit_test(request->wValue, 1));

     break;

 

     default: return false; // stall unsupported request

diff --git a/src/class/cdc/cdc_device.h b/src/class/cdc/cdc_device.h
index 18d6f842f..44fd9215f 100644
--- a/src/class/cdc/cdc_device.h
+++ b/src/class/cdc/cdc_device.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/class/cdc/cdc_host.c b/src/class/cdc/cdc_host.c
index 75c805152..b64d4a1fe 100644
--- a/src/class/cdc/cdc_host.c
+++ b/src/class/cdc/cdc_host.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/class/cdc/cdc_host.h b/src/class/cdc/cdc_host.h
index 7a302eb0f..59ad2bfa8 100644
--- a/src/class/cdc/cdc_host.h
+++ b/src/class/cdc/cdc_host.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/class/cdc/cdc_rndis.h b/src/class/cdc/cdc_rndis.h
index 70f76604b..e0f129fe3 100644
--- a/src/class/cdc/cdc_rndis.h
+++ b/src/class/cdc/cdc_rndis.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/class/cdc/cdc_rndis_host.c b/src/class/cdc/cdc_rndis_host.c
index 587e9ddc8..c604aef4a 100644
--- a/src/class/cdc/cdc_rndis_host.c
+++ b/src/class/cdc/cdc_rndis_host.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
@@ -43,7 +43,7 @@
 CFG_TUSB_MEM_SECTION static uint8_t msg_notification[CFG_TUSB_HOST_DEVICE_MAX][8];
 CFG_TUSB_MEM_SECTION ATTR_ALIGNED(4) static uint8_t msg_payload[RNDIS_MSG_PAYLOAD_MAX];
 
-STATIC_VAR rndish_data_t rndish_data[CFG_TUSB_HOST_DEVICE_MAX];
+static rndish_data_t rndish_data[CFG_TUSB_HOST_DEVICE_MAX];
 
 // TODO Microsoft requires message length for any get command must be at least 4096 bytes
 
diff --git a/src/class/cdc/cdc_rndis_host.h b/src/class/cdc/cdc_rndis_host.h
index 24becee07..170cb3b0e 100644
--- a/src/class/cdc/cdc_rndis_host.h
+++ b/src/class/cdc/cdc_rndis_host.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