Browse Source

Merge commit 'e1e201e' into littlefury

Luke Dashjr 12 years ago
parent
commit
a545a42e56
5 changed files with 24 additions and 70 deletions
  1. 3 6
      driver-bitfury.c
  2. 4 7
      libbitfury.c
  3. 0 26
      libbitfury.h
  4. 17 13
      spidevc.c
  5. 0 18
      spidevc.h

+ 3 - 6
driver-bitfury.c

@@ -1,8 +1,6 @@
 /*
- * device-bitfury.c - device functions for Bitfury chip/board library
- *
- * Copyright (c) 2013 bitfury
- * Copyright (c) 2013 legkodymov
+ * Copyright 2013 bitfury
+ * Copyright 2013 legkodymov
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,8 +19,7 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
- *
-*/
+ */
 
 #include "miner.h"
 #include <unistd.h>

+ 4 - 7
libbitfury.c

@@ -1,8 +1,6 @@
-/**
- * libbitfury.c - library for Bitfury chip/board
- *
- * Copyright (c) 2013 bitfury
- * Copyright (c) 2013 legkodymov
+/*
+ * Copyright 2013 bitfury
+ * Copyright 2013 legkodymov
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,8 +19,7 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
- *
-**/
+ */
 
 #include "config.h"
 

+ 0 - 26
libbitfury.h

@@ -1,29 +1,3 @@
-/**
- * libbitfury.h - library for Bitfury chip/board
- *
- * Copyright (c) 2013 bitfury
- * Copyright (c) 2013 legkodymov
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
-**/
-
 #ifndef __LIBBITFURY_H__
 #define __LIBBITFURY_H__
 

+ 17 - 13
spidevc.c

@@ -1,20 +1,24 @@
 /*
- *   spidevc.c - SPI library for raspberry pi/bitfury chip/board
+ * Copyright 2013 bitfury
  *
- *   Copyright (c) 2013 bitfury
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2 as
- *   published by the Free Software Foundation.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- *   This program is distributed in the hope that it will be useful, but
- *   WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *   General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, see http://www.gnu.org/licenses/.
-*/
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
 
 #include "spidevc.h"
 #include <sys/mman.h>

+ 0 - 18
spidevc.h

@@ -1,21 +1,3 @@
-/*
- *   spidevc.h - SPI library for raspberry pi/bitfury chip/board
- *
- *   Copyright (c) 2013 bitfury
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2 as
- *   published by the Free Software Foundation.
- *
- *   This program is distributed in the hope that it will be useful, but
- *   WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *   General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, see http://www.gnu.org/licenses/.
-*/
-
 #ifndef SPIDEVC_H
 #define SPIDEVC_H