diff options
| author | Keith Packard <keithp@keithp.com> | 2014-07-15 22:55:20 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-07-15 22:55:20 -0700 |
| commit | 3cf030fffffd223c3717011e03aac82346295d71 (patch) | |
| tree | b6da4fbb1180b75bedb86ce608503a6c0aeb47f3 /src/core/ao_config.h | |
| parent | 607fbb01710be1cb263625337f5be3d0fb48d5e7 (diff) | |
| parent | 9ab3a1de95b705783c31a7e16447f52c10b6b480 (diff) | |
Merge tag '1.4' into fox
tagging 1.4 release
Conflicts:
src/Makefile
Diffstat (limited to 'src/core/ao_config.h')
| -rw-r--r-- | src/core/ao_config.h | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/src/core/ao_config.h b/src/core/ao_config.h deleted file mode 100644 index e101af8e..00000000 --- a/src/core/ao_config.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright © 2013 Keith Packard <keithp@keithp.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * 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, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ - -#ifndef _AO_CONFIG_H_ -#define _AO_CONFIG_H_ - -#ifndef USE_STORAGE_CONFIG -#define USE_STORAGE_CONFIG 1 -#endif - -#ifndef USE_EEPROM_CONFIG -#define USE_EEPROM_CONFIG 0 -#endif - -#if USE_STORAGE_CONFIG - -#include <ao_storage.h> - -#define ao_config_setup() ao_storage_setup() -#define ao_config_erase() ao_storage_erase(ao_storage_config) -#define ao_config_write(pos,bytes, len) ao_storage_write(ao_storage_config+(pos), bytes, len) -#define ao_config_read(pos,bytes, len) ao_storage_read(ao_storage_config+(pos), bytes, len) -#define ao_config_flush() ao_storage_flush() - -#endif - -#if USE_EEPROM_CONFIG - -#include <ao_eeprom.h> - -#define ao_config_setup() -#define ao_config_erase() -#define ao_config_write(pos,bytes, len) ao_eeprom_write(pos, bytes, len) -#define ao_config_read(pos,bytes, len) ao_eeprom_read(pos, bytes, len) -#define ao_config_flush() - -#endif - -#endif /* _AO_CONFIG_H_ */ |