changeset 217:60aeeb749f3c

8132086: controllerName parameter is ignored at static config Summary: Constants were renamed and example property has been updated Reviewed-by: alkonsta
author snazarki
date Tue, 21 Jul 2015 22:08:36 +0300
parents a65439c34396
children 1cc45ae786e5
files config/dio.properties-raspberrypi src/share/classes/com/oracle/dio/utils/Constants.java
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/config/dio.properties-raspberrypi	Tue Jul 21 14:58:21 2015 +0300
+++ b/config/dio.properties-raspberrypi	Tue Jul 21 22:08:36 2015 +0300
@@ -35,10 +35,10 @@
 8 = deviceType: gpio.GPIOPin, pinNumber:25, name:GPIO25, mode:4, direction:1, predefined:true
 9 = deviceType: gpio.GPIOPin, pinNumber:27, name:GPIO27, predefined:true
 
-300 = deviceType: spibus.SPIDevice, name:SPI0.0, deviceNumber:0, address:0, csActive:1, wordLength:8, clockFrequency:500000, clockMode:1, bitOrdering:1, predefined:true
+300 = deviceType: spibus.SPIDevice, name:SPI0.0, controllerNumber:0, address:0, csActive:1, wordLength:8, clockFrequency:500000, clockMode:1, bitOrdering:1, predefined:true
 
-100 = deviceType: uart.UART, deviceName:ttyAMA0, name:ttyAMA0, baudRate:19200, dataBits:8, parity:0, stopBits:1, flowControl:0, predefined:true
+100 = deviceType: uart.UART, controllerName:ttyAMA0, name:ttyAMA0, baudRate:19200, dataBits:8, parity:0, stopBits:1, flowControl:0, predefined:true
 
-gpio.GPIOPin = initValue:0, deviceNumber:0, direction:0, mode:1, trigger:3, predefined:true
+gpio.GPIOPin = initValue:0, controllerNumber:0, direction:0, mode:1, trigger:3, predefined:true
 uart.UART = baudRate:19200, parity:0, dataBits:8, stopBits:1, flowControl:0, predefined:true
 
--- a/src/share/classes/com/oracle/dio/utils/Constants.java	Tue Jul 21 14:58:21 2015 +0300
+++ b/src/share/classes/com/oracle/dio/utils/Constants.java	Tue Jul 21 22:08:36 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,13 +33,13 @@
     public static final String FACTORY = "Factory";
     public static final String CONFIG = "Config";
     public static final int INVALID_HANDLE = -1;
-    public static final String PATH = "deviceName";
+    public static final String PATH = "controllerName";
     public static final String IMPL = ".impl.";
     public static final String TYPE = "type";
     public static final String DIRECTION= "direction";
     public static final String INIT_VALUE = "initValue";
     public static final int MAX_WORD_LEN = 32;
-    public static final String DEVICE_NUMBER = "deviceNumber";
+    public static final String DEVICE_NUMBER = "controllerNumber";
     public static final String CHANNEL_NUMBER = "channelNumber";
     public static final String PROPERTIES = "properties";
     public static final String RESOLUTION = "resolution";