aboutsummaryrefslogtreecommitdiffstats
path: root/os
diff options
context:
space:
mode:
authorDiego Ismirlian <dismirlian (at) google's mail.com>2017-06-06 15:25:05 -0300
committerDiego Ismirlian <dismirlian (at) google's mail.com>2017-06-06 15:25:05 -0300
commit5a876ba2b04ee0933ced272b04e2ee481e48a1b1 (patch)
treef2ba6a5034e0a28d0d1c7b1aa63e9afe8e49993f /os
parent50dda7cff22574816f415d5c5003240badcf3d32 (diff)
downloadChibiOS-Contrib-5a876ba2b04ee0933ced272b04e2ee481e48a1b1.tar.gz
ChibiOS-Contrib-5a876ba2b04ee0933ced272b04e2ee481e48a1b1.tar.bz2
ChibiOS-Contrib-5a876ba2b04ee0933ced272b04e2ee481e48a1b1.zip
USBH: License change for UVC driver
Diffstat (limited to 'os')
-rw-r--r--os/hal/include/usbh/dev/uvc.h4
-rw-r--r--os/hal/src/usbh/hal_usbh_uvc.c24
2 files changed, 16 insertions, 12 deletions
diff --git a/os/hal/include/usbh/dev/uvc.h b/os/hal/include/usbh/dev/uvc.h
index 845b93e..ab12199 100644
--- a/os/hal/include/usbh/dev/uvc.h
+++ b/os/hal/include/usbh/dev/uvc.h
@@ -1,6 +1,6 @@
/*
- ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio
- Copyright (C) 2015..2016 Diego Ismirlian, TISA, (dismirlian (at) google's mail)
+ ChibiOS - Copyright (C) 2006..2017 Giovanni Di Sirio
+ Copyright (C) 2015..2017 Diego Ismirlian, (dismirlian (at) google's mail)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/os/hal/src/usbh/hal_usbh_uvc.c b/os/hal/src/usbh/hal_usbh_uvc.c
index 72c15c0..9cbbb03 100644
--- a/os/hal/src/usbh/hal_usbh_uvc.c
+++ b/os/hal/src/usbh/hal_usbh_uvc.c
@@ -1,14 +1,18 @@
/*
- * usbh_uvc.c
- *
- * Created on: 14 de set. de 2015
- * Author: Diego Ismirlian (dismirlian (at) google's mail (dot) com)
- *
- * License:
- *
- * This file is free for non-commercial use until the company I work for decides what to do.
- * If in doubt, please contact me.
- *
+ ChibiOS - Copyright (C) 2006..2017 Giovanni Di Sirio
+ Copyright (C) 2015..2017 Diego Ismirlian, (dismirlian (at) google's mail)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
*/
#include "hal.h"