changeset 106:47c1eb709fd4

8073486: Update JaveME API decorators Summary: DIO1.1 decorators required for JavaME SDK Reviewed-by: alkonsta
author snazarki
date Thu, 19 Feb 2015 18:42:52 +0300
parents 56c334d1408c
children 42408fd53ee7
files src/share/classes/jdk/dio/AsyncErrorHandler.java src/share/classes/jdk/dio/BufferAccess.java src/share/classes/jdk/dio/ClosedDeviceException.java src/share/classes/jdk/dio/Device.java src/share/classes/jdk/dio/DeviceAlreadyExistsException.java src/share/classes/jdk/dio/DeviceConfig.java src/share/classes/jdk/dio/DeviceDescriptor.java src/share/classes/jdk/dio/DeviceEvent.java src/share/classes/jdk/dio/DeviceEventListener.java src/share/classes/jdk/dio/DeviceException.java src/share/classes/jdk/dio/DeviceManager.java src/share/classes/jdk/dio/DeviceMgmtPermission.java src/share/classes/jdk/dio/DeviceNotFoundException.java src/share/classes/jdk/dio/DevicePermission.java src/share/classes/jdk/dio/InputRoundListener.java src/share/classes/jdk/dio/InvalidDeviceConfigException.java src/share/classes/jdk/dio/OutputRoundListener.java src/share/classes/jdk/dio/RegistrationEvent.java src/share/classes/jdk/dio/RegistrationListener.java src/share/classes/jdk/dio/RoundCompletionEvent.java src/share/classes/jdk/dio/Transactional.java src/share/classes/jdk/dio/UnavailableDeviceException.java src/share/classes/jdk/dio/UnsupportedAccessModeException.java src/share/classes/jdk/dio/UnsupportedDeviceTypeException.java src/share/classes/jdk/dio/adc/ADCChannel.java src/share/classes/jdk/dio/adc/ADCChannelConfig.java src/share/classes/jdk/dio/adc/ADCPermission.java src/share/classes/jdk/dio/adc/AcquisitionRoundListener.java src/share/classes/jdk/dio/adc/InvalidInputSamplingRateException.java src/share/classes/jdk/dio/adc/MonitoringEvent.java src/share/classes/jdk/dio/adc/MonitoringListener.java src/share/classes/jdk/dio/adc/package-info.java src/share/classes/jdk/dio/atcmd/ATDevice.java src/share/classes/jdk/dio/atcmd/ATDeviceConfig.java src/share/classes/jdk/dio/atcmd/ATModem.java src/share/classes/jdk/dio/atcmd/ATPermission.java src/share/classes/jdk/dio/atcmd/CommandResponseHandler.java src/share/classes/jdk/dio/atcmd/DataConnection.java src/share/classes/jdk/dio/atcmd/DataConnectionHandler.java src/share/classes/jdk/dio/atcmd/UnsolicitedResponseHandler.java src/share/classes/jdk/dio/atcmd/package-info.java src/share/classes/jdk/dio/counter/CounterPermission.java src/share/classes/jdk/dio/counter/CountingEvent.java src/share/classes/jdk/dio/counter/CountingListener.java src/share/classes/jdk/dio/counter/PulseCounter.java src/share/classes/jdk/dio/counter/PulseCounterConfig.java src/share/classes/jdk/dio/counter/package-info.java src/share/classes/jdk/dio/dac/DACChannel.java src/share/classes/jdk/dio/dac/DACChannelConfig.java src/share/classes/jdk/dio/dac/DACPermission.java src/share/classes/jdk/dio/dac/GenerationRoundListener.java src/share/classes/jdk/dio/dac/InvalidOutputSamplingRateException.java src/share/classes/jdk/dio/dac/package-info.java src/share/classes/jdk/dio/generic/GenericBufferIODevice.java src/share/classes/jdk/dio/generic/GenericDevice.java src/share/classes/jdk/dio/generic/GenericDeviceConfig.java src/share/classes/jdk/dio/generic/GenericDeviceControl.java src/share/classes/jdk/dio/generic/GenericEvent.java src/share/classes/jdk/dio/generic/GenericEventListener.java src/share/classes/jdk/dio/generic/GenericPermission.java src/share/classes/jdk/dio/generic/package-info.java src/share/classes/jdk/dio/gpio/GPIOPin.java src/share/classes/jdk/dio/gpio/GPIOPinConfig.java src/share/classes/jdk/dio/gpio/GPIOPinPermission.java src/share/classes/jdk/dio/gpio/GPIOPort.java src/share/classes/jdk/dio/gpio/GPIOPortConfig.java src/share/classes/jdk/dio/gpio/GPIOPortPermission.java src/share/classes/jdk/dio/gpio/PinEvent.java src/share/classes/jdk/dio/gpio/PinListener.java src/share/classes/jdk/dio/gpio/PortEvent.java src/share/classes/jdk/dio/gpio/PortListener.java src/share/classes/jdk/dio/gpio/package-info.java src/share/classes/jdk/dio/i2cbus/I2CCombinedMessage.java src/share/classes/jdk/dio/i2cbus/I2CDevice.java src/share/classes/jdk/dio/i2cbus/I2CDeviceConfig.java src/share/classes/jdk/dio/i2cbus/I2CPermission.java src/share/classes/jdk/dio/i2cbus/package-info.java src/share/classes/jdk/dio/modem/ModemSignalEvent.java src/share/classes/jdk/dio/modem/ModemSignalListener.java src/share/classes/jdk/dio/modem/ModemSignalsControl.java src/share/classes/jdk/dio/modem/package-info.java src/share/classes/jdk/dio/package-info.java src/share/classes/jdk/dio/power/PowerManaged.java src/share/classes/jdk/dio/power/PowerSavingHandler.java src/share/classes/jdk/dio/power/package-info.java src/share/classes/jdk/dio/pwm/GenerationEvent.java src/share/classes/jdk/dio/pwm/GenerationListener.java src/share/classes/jdk/dio/pwm/GenerationRoundListener.java src/share/classes/jdk/dio/pwm/InvalidPulseRateException.java src/share/classes/jdk/dio/pwm/PWMChannel.java src/share/classes/jdk/dio/pwm/PWMChannelConfig.java src/share/classes/jdk/dio/pwm/PWMPermission.java src/share/classes/jdk/dio/pwm/package-info.java src/share/classes/jdk/dio/spi/AbstractDevice.java src/share/classes/jdk/dio/spi/DeviceProvider.java src/share/classes/jdk/dio/spi/package-info.java src/share/classes/jdk/dio/spibus/InvalidWordLengthException.java src/share/classes/jdk/dio/spibus/SPIDevice.java src/share/classes/jdk/dio/spibus/SPIDeviceConfig.java src/share/classes/jdk/dio/spibus/SPIPermission.java src/share/classes/jdk/dio/uart/ModemUART.java src/share/classes/jdk/dio/uart/UART.java src/share/classes/jdk/dio/uart/UARTConfig.java src/share/classes/jdk/dio/uart/UARTEvent.java src/share/classes/jdk/dio/uart/UARTEventListener.java src/share/classes/jdk/dio/uart/UARTPermission.java src/share/classes/jdk/dio/uart/package-info.java src/share/classes/jdk/dio/watchdog/WatchdogTimer.java src/share/classes/jdk/dio/watchdog/WatchdogTimerConfig.java src/share/classes/jdk/dio/watchdog/WatchdogTimerPermission.java src/share/classes/jdk/dio/watchdog/WindowedWatchdogTimer.java src/share/classes/jdk/dio/watchdog/package-info.java
diffstat 112 files changed, 211 insertions(+), 211 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/jdk/dio/AsyncErrorHandler.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/AsyncErrorHandler.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -37,7 +37,7 @@
  *            the device type that generates the error.
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1")
 public interface AsyncErrorHandler<P extends Device<? super P>> {
 
     /**
--- a/src/share/classes/jdk/dio/BufferAccess.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/BufferAccess.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -36,7 +36,7 @@
  *            the I/O buffer type.
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1")
 public interface BufferAccess<B extends Buffer> {
 
     /**
--- a/src/share/classes/jdk/dio/ClosedDeviceException.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/ClosedDeviceException.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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,7 +33,7 @@
  *
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1")
 public class ClosedDeviceException extends ClosedChannelException {
 
     /**
--- a/src/share/classes/jdk/dio/Device.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/Device.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -43,7 +43,7 @@
  *            the device type the descriptor is defined for.
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1")
 public interface Device<P extends Device<? super P>> extends Channel {
 
     /**
--- a/src/share/classes/jdk/dio/DeviceAlreadyExistsException.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/DeviceAlreadyExistsException.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -31,7 +31,7 @@
  *
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1")
 public class DeviceAlreadyExistsException extends DeviceException {
 
     /**
--- a/src/share/classes/jdk/dio/DeviceConfig.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/DeviceConfig.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -66,7 +66,7 @@
  * @see InvalidDeviceConfigException
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1")
 public interface DeviceConfig<P extends Device<? super P>> {
 
     /**
@@ -80,7 +80,7 @@
      *
      * @since 1.0
      */
-    @apimarker.API("device-io_1.0")
+    @apimarker.API("device-io_1.1")
     public interface HardwareAddressing {
 
         /**
--- a/src/share/classes/jdk/dio/DeviceDescriptor.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/DeviceDescriptor.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -34,7 +34,7 @@
  *            the device type the descriptor is defined for.
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1")
 public interface DeviceDescriptor<P extends Device<? super P>> {
 
     /**
--- a/src/share/classes/jdk/dio/DeviceEvent.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/DeviceEvent.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -36,7 +36,7 @@
  *            the device type the event is defined for.
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1")
 public abstract class DeviceEvent<P extends Device<? super P>> {
 
     /**
--- a/src/share/classes/jdk/dio/DeviceEventListener.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/DeviceEventListener.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -41,6 +41,6 @@
  *
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1")
 public interface DeviceEventListener {
 }
--- a/src/share/classes/jdk/dio/DeviceException.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/DeviceException.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -32,7 +32,7 @@
  *
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1")
 public class DeviceException extends IOException {
 
     /**
--- a/src/share/classes/jdk/dio/DeviceManager.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/DeviceManager.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -118,7 +118,7 @@
  * @see DeviceConfig
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1")
 public class DeviceManager {
     /**
      * Exclusive access mode.
--- a/src/share/classes/jdk/dio/DeviceMgmtPermission.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/DeviceMgmtPermission.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -90,7 +90,7 @@
  * @see DeviceManager#unregister DeviceManager.unregister
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1")
 public class DeviceMgmtPermission  extends Permission {
 
     /**
--- a/src/share/classes/jdk/dio/DeviceNotFoundException.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/DeviceNotFoundException.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -30,7 +30,7 @@
  *
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1")
 public class DeviceNotFoundException extends DeviceException {
 
     /**
--- a/src/share/classes/jdk/dio/DevicePermission.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/DevicePermission.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -96,7 +96,7 @@
  * @see jdk.dio.power.PowerManaged
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1")
 public abstract class DevicePermission extends Permission {
 
     /**
--- a/src/share/classes/jdk/dio/InputRoundListener.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/InputRoundListener.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -42,7 +42,7 @@
  *            the input buffer type.
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1")
 public interface InputRoundListener<P extends Device<? super P>, B extends Buffer> extends DeviceEventListener,
         AsyncErrorHandler<P> {
 
--- a/src/share/classes/jdk/dio/InvalidDeviceConfigException.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/InvalidDeviceConfigException.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -30,7 +30,7 @@
  *
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1")
 public class InvalidDeviceConfigException extends DeviceException {
 
     /**
--- a/src/share/classes/jdk/dio/OutputRoundListener.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/OutputRoundListener.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -42,7 +42,7 @@
  *            the output buffer type.
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1")
 public interface OutputRoundListener<P extends Device<? super P>, B extends Buffer> extends
         DeviceEventListener, AsyncErrorHandler<P> {
 
--- a/src/share/classes/jdk/dio/RegistrationEvent.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/RegistrationEvent.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -37,7 +37,7 @@
  * @see RegistrationListener
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1")
 public class RegistrationEvent<P extends Device<? super P>> extends EventObject {
     /**
      * The identifying and descriptive information of the registered or unregistered device.
--- a/src/share/classes/jdk/dio/RegistrationListener.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/RegistrationListener.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -39,7 +39,7 @@
  * @see DeviceManager
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1")
 public interface RegistrationListener<P extends Device<? super P>> extends EventListener {
 
     /**
--- a/src/share/classes/jdk/dio/RoundCompletionEvent.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/RoundCompletionEvent.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -40,7 +40,7 @@
  * @see OutputRoundListener
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1")
 public class RoundCompletionEvent<P extends Device<? super P>, B extends Buffer> extends DeviceEvent<P> {
     /**
      * The input or output buffer.
--- a/src/share/classes/jdk/dio/Transactional.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/Transactional.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -53,7 +53,7 @@
  *
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1")
 public interface Transactional {
 
     /**
--- a/src/share/classes/jdk/dio/UnavailableDeviceException.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/UnavailableDeviceException.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -31,7 +31,7 @@
  *
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1")
 public class UnavailableDeviceException extends DeviceException {
 
     /**
--- a/src/share/classes/jdk/dio/UnsupportedAccessModeException.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/UnsupportedAccessModeException.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -31,7 +31,7 @@
  *
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1")
 public class UnsupportedAccessModeException extends DeviceException {
 
     /**
--- a/src/share/classes/jdk/dio/UnsupportedDeviceTypeException.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/UnsupportedDeviceTypeException.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -31,7 +31,7 @@
  *
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1")
 public class UnsupportedDeviceTypeException extends DeviceException {
 
     /**
--- a/src/share/classes/jdk/dio/adc/ADCChannel.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/adc/ADCChannel.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -89,7 +89,7 @@
  * @see ADCPermission
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_adc")
 @WeakDontRenameClass
 public interface ADCChannel extends Device<ADCChannel>, BufferAccess<IntBuffer> {
 
--- a/src/share/classes/jdk/dio/adc/ADCChannelConfig.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/adc/ADCChannelConfig.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -52,7 +52,7 @@
  * @since 1.0
  */
 @SerializeMe
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_adc")
 public final class ADCChannelConfig implements DeviceConfig<ADCChannel>, DeviceConfig.HardwareAddressing {
     private String controllerName;
     private int channelNumber = DEFAULT;
--- a/src/share/classes/jdk/dio/adc/ADCPermission.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/adc/ADCPermission.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -60,7 +60,7 @@
  * @see jdk.dio.power.PowerManaged
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_adc")
 public class ADCPermission extends DevicePermission {
 
     /**
--- a/src/share/classes/jdk/dio/adc/AcquisitionRoundListener.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/adc/AcquisitionRoundListener.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -41,7 +41,7 @@
  * @see ADCChannel#startAcquisition ADCChannel.startAcquisition
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_adc")
 public interface AcquisitionRoundListener extends InputRoundListener<ADCChannel, IntBuffer> {
 
     /**
--- a/src/share/classes/jdk/dio/adc/InvalidInputSamplingRateException.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/adc/InvalidInputSamplingRateException.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -31,7 +31,7 @@
  *
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_adc")
 public class InvalidInputSamplingRateException extends RuntimeException {
 
     /**
--- a/src/share/classes/jdk/dio/adc/MonitoringEvent.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/adc/MonitoringEvent.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -37,7 +37,7 @@
  * @see MonitoringListener
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_adc")
 public class MonitoringEvent extends DeviceEvent<ADCChannel> {
     /**
      * Indicates that the ADC channel value got back within the defined range.
--- a/src/share/classes/jdk/dio/adc/MonitoringListener.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/adc/MonitoringListener.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -38,7 +38,7 @@
  * @see ADCChannel
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_adc")
 public interface MonitoringListener extends DeviceEventListener, AsyncErrorHandler<ADCChannel> {
 
     /**
--- a/src/share/classes/jdk/dio/adc/package-info.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/adc/package-info.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
--- a/src/share/classes/jdk/dio/atcmd/ATDevice.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/atcmd/ATDevice.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -124,7 +124,7 @@
  * @see DataConnection
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_atcmd")
 @WeakDontRenameClass
 public interface ATDevice extends Device<ATDevice> {
 
--- a/src/share/classes/jdk/dio/atcmd/ATDeviceConfig.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/atcmd/ATDeviceConfig.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -52,7 +52,7 @@
  * @since 1.0
  */
 @SerializeMe
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_atcmd")
 public class ATDeviceConfig implements DeviceConfig<ATDevice>, DeviceConfig.HardwareAddressing {
 
     private String controllerName;
--- a/src/share/classes/jdk/dio/atcmd/ATModem.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/atcmd/ATModem.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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,7 +33,7 @@
  * module using AT commands and modem control signals.
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_atcmd")
 @WeakDontRenameClass
 public interface ATModem extends ATDevice, ModemSignalsControl<ATModem> {
 }
--- a/src/share/classes/jdk/dio/atcmd/ATPermission.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/atcmd/ATPermission.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -62,7 +62,7 @@
  * @see ATDevice#openDataConnection ATDevice.openDataConnection
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_atcmd")
 public class ATPermission extends DevicePermission {
 
     /**
--- a/src/share/classes/jdk/dio/atcmd/CommandResponseHandler.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/atcmd/CommandResponseHandler.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -43,7 +43,7 @@
  * @see ATDevice
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_atcmd")
 public interface CommandResponseHandler {
 
     /**
--- a/src/share/classes/jdk/dio/atcmd/DataConnection.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/atcmd/DataConnection.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -32,7 +32,7 @@
  * connection opened by issuing an AT command (e.g. {@code ATD}).
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_atcmd")
 public interface DataConnection extends ByteChannel {
 
     /**
--- a/src/share/classes/jdk/dio/atcmd/DataConnectionHandler.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/atcmd/DataConnectionHandler.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -34,7 +34,7 @@
  * {@code DataConnectionHandler}.
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_atcmd")
 public interface DataConnectionHandler {
 
     /**
--- a/src/share/classes/jdk/dio/atcmd/UnsolicitedResponseHandler.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/atcmd/UnsolicitedResponseHandler.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -41,7 +41,7 @@
  * @see ATDevice
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_atcmd")
 public interface UnsolicitedResponseHandler {
     /**
      * Invoked to process an unsolicited result code response.
--- a/src/share/classes/jdk/dio/atcmd/package-info.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/atcmd/package-info.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
--- a/src/share/classes/jdk/dio/counter/CounterPermission.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/counter/CounterPermission.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -60,7 +60,7 @@
  * @see jdk.dio.power.PowerManaged
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_counter")
 public class CounterPermission extends DevicePermission {
 
     /**
--- a/src/share/classes/jdk/dio/counter/CountingEvent.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/counter/CountingEvent.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -37,7 +37,7 @@
  * @see CountingListener
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_counter")
 public class CountingEvent extends DeviceEvent<PulseCounter> {
     /**
      * Indicates that the pulse counting time interval has expired.
--- a/src/share/classes/jdk/dio/counter/CountingListener.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/counter/CountingListener.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -40,7 +40,7 @@
  * @see PulseCounter
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_counter")
 public interface CountingListener extends DeviceEventListener, AsyncErrorHandler<PulseCounter> {
 
     /**
--- a/src/share/classes/jdk/dio/counter/PulseCounter.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/counter/PulseCounter.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -78,7 +78,7 @@
  * @see CounterPermission
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_counter")
 @WeakDontRenameClass
 public interface PulseCounter extends Device<PulseCounter> {
 
--- a/src/share/classes/jdk/dio/counter/PulseCounterConfig.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/counter/PulseCounterConfig.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -58,7 +58,7 @@
  * @since 1.0
  */
 @SerializeMe
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_counter")
 public class PulseCounterConfig implements DeviceConfig<PulseCounter>, DeviceConfig.HardwareAddressing {
 
     /**
--- a/src/share/classes/jdk/dio/counter/package-info.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/counter/package-info.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
--- a/src/share/classes/jdk/dio/dac/DACChannel.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/dac/DACChannel.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -79,7 +79,7 @@
  * @see GenerationRoundListener
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_dac")
 @WeakDontRenameClass
 public interface DACChannel extends Device<DACChannel>, BufferAccess<IntBuffer> {
 
--- a/src/share/classes/jdk/dio/dac/DACChannelConfig.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/dac/DACChannelConfig.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -52,7 +52,7 @@
  * @since 1.0
  */
 @SerializeMe
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_dac")
 public final class DACChannelConfig implements DeviceConfig<DACChannel>, DeviceConfig.HardwareAddressing  {
     private String controllerName;
     private int channelNumber = DEFAULT;
--- a/src/share/classes/jdk/dio/dac/DACPermission.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/dac/DACPermission.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -58,7 +58,7 @@
  * @see jdk.dio.power.PowerManaged
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_dac")
 public class DACPermission extends DevicePermission {
 
     /**
--- a/src/share/classes/jdk/dio/dac/GenerationRoundListener.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/dac/GenerationRoundListener.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -42,7 +42,7 @@
  * @see DACChannel#startGeneration DACChannel.startGeneration
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_dac")
 public interface GenerationRoundListener extends OutputRoundListener<DACChannel, IntBuffer> {
 
     /**
--- a/src/share/classes/jdk/dio/dac/InvalidOutputSamplingRateException.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/dac/InvalidOutputSamplingRateException.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -31,7 +31,7 @@
  *
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_dac")
 public class InvalidOutputSamplingRateException extends RuntimeException {
 
     /**
--- a/src/share/classes/jdk/dio/dac/package-info.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/dac/package-info.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
--- a/src/share/classes/jdk/dio/generic/GenericBufferIODevice.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/generic/GenericBufferIODevice.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -43,7 +43,7 @@
  * {@link jdk.dio.i2cbus.I2CDevice}.
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_generic")
 @WeakDontRenameClass
 public interface GenericBufferIODevice extends GenericDevice, ByteChannel, BufferAccess<ByteBuffer> {
 
--- a/src/share/classes/jdk/dio/generic/GenericDevice.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/generic/GenericDevice.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -68,7 +68,7 @@
  * @see GenericPermission
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_generic")
 @WeakDontRenameClass
 public interface GenericDevice extends Device<GenericDevice> {
 
--- a/src/share/classes/jdk/dio/generic/GenericDeviceConfig.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/generic/GenericDeviceConfig.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -52,7 +52,7 @@
  * @since 1.0
  */
 @SerializeMe
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_generic")
 public final class GenericDeviceConfig implements DeviceConfig<GenericDevice>, DeviceConfig.HardwareAddressing {
     private String controllerName;
     private int channelNumber = DEFAULT;
--- a/src/share/classes/jdk/dio/generic/GenericDeviceControl.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/generic/GenericDeviceControl.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -39,7 +39,7 @@
  * @see GenericDevice#setControl GenericDevice.setControl
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_generic")
 public class GenericDeviceControl<T> {
     private int id = -1;
     private Class<T> type = null;
--- a/src/share/classes/jdk/dio/generic/GenericEvent.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/generic/GenericEvent.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -35,7 +35,7 @@
  * @see GenericEventListener
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_generic")
 public class GenericEvent extends DeviceEvent<GenericDevice> {
 
     /**
--- a/src/share/classes/jdk/dio/generic/GenericEventListener.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/generic/GenericEventListener.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -37,7 +37,7 @@
  * @see GenericEvent
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_generic")
 public interface GenericEventListener extends DeviceEventListener {
 
     /**
--- a/src/share/classes/jdk/dio/generic/GenericPermission.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/generic/GenericPermission.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -58,7 +58,7 @@
  * @see jdk.dio.power.PowerManaged
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_generic")
 public class GenericPermission extends DevicePermission {
 
     /**
--- a/src/share/classes/jdk/dio/generic/package-info.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/generic/package-info.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
--- a/src/share/classes/jdk/dio/gpio/GPIOPin.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/gpio/GPIOPin.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -80,7 +80,7 @@
  * @see GPIOPinPermission
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_gpio")
 @WeakDontRenameClass
 public interface GPIOPin extends Device<GPIOPin> {
 
--- a/src/share/classes/jdk/dio/gpio/GPIOPinConfig.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/gpio/GPIOPinConfig.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -51,7 +51,7 @@
  * @since 1.0
  */
 @SerializeMe
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_gpio")
 public final class GPIOPinConfig implements  DeviceConfig<GPIOPin>, DeviceConfig.HardwareAddressing {
 
     /**
--- a/src/share/classes/jdk/dio/gpio/GPIOPinPermission.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/gpio/GPIOPinPermission.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -62,7 +62,7 @@
  * @see jdk.dio.power.PowerManaged
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_gpio")
 public class GPIOPinPermission extends DevicePermission {
 
     /**
--- a/src/share/classes/jdk/dio/gpio/GPIOPort.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/gpio/GPIOPort.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -89,7 +89,7 @@
  * @see GPIOPortPermission
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_gpio")
 @WeakDontRenameClass
 public interface GPIOPort extends Device<GPIOPort> {
 
--- a/src/share/classes/jdk/dio/gpio/GPIOPortConfig.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/gpio/GPIOPortConfig.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -55,7 +55,7 @@
  * @since 1.0
  */
 @SerializeMe
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_gpio")
 public final class GPIOPortConfig implements DeviceConfig<GPIOPort> {
 
     /**
--- a/src/share/classes/jdk/dio/gpio/GPIOPortPermission.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/gpio/GPIOPortPermission.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -60,7 +60,7 @@
  * @see jdk.dio.power.PowerManaged
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_gpio")
 public class GPIOPortPermission extends DevicePermission {
 
     /**
--- a/src/share/classes/jdk/dio/gpio/PinEvent.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/gpio/PinEvent.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -35,7 +35,7 @@
  * @see PinListener
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_gpio")
 public class PinEvent extends DeviceEvent<GPIOPin> {
 
     /**
--- a/src/share/classes/jdk/dio/gpio/PinListener.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/gpio/PinListener.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -36,7 +36,7 @@
  * @see GPIOPin
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_gpio")
 public interface PinListener extends DeviceEventListener {
 
     /**
--- a/src/share/classes/jdk/dio/gpio/PortEvent.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/gpio/PortEvent.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -35,7 +35,7 @@
  * @see PortListener
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_gpio")
 public class PortEvent extends DeviceEvent<GPIOPort> {
 
     /**
--- a/src/share/classes/jdk/dio/gpio/PortListener.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/gpio/PortListener.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -35,7 +35,7 @@
  * @see GPIOPort
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_gpio")
 public interface PortListener {
 
     /**
--- a/src/share/classes/jdk/dio/gpio/package-info.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/gpio/package-info.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
--- a/src/share/classes/jdk/dio/i2cbus/I2CCombinedMessage.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/i2cbus/I2CCombinedMessage.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -68,7 +68,7 @@
  *
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_i2cbus")
 public interface I2CCombinedMessage {
 
     /**
--- a/src/share/classes/jdk/dio/i2cbus/I2CDevice.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/i2cbus/I2CDevice.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -114,7 +114,7 @@
  * @see ClosedDeviceException
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_i2cbus")
 @WeakDontRenameClass
 public interface I2CDevice extends Device<I2CDevice>, ByteChannel, BufferAccess<ByteBuffer> {
 
@@ -123,7 +123,7 @@
      * providing methods for creating combined messages.
      * @since 1.0
      */
-    @apimarker.API("device-io_1.0")
+    @apimarker.API("device-io_1.1_i2cbus")
     public interface Bus {
 
         /**
--- a/src/share/classes/jdk/dio/i2cbus/I2CDeviceConfig.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/i2cbus/I2CDeviceConfig.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -51,7 +51,7 @@
  * @since 1.0
  */
 @SerializeMe
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_i2cbus")
 public final class I2CDeviceConfig implements DeviceConfig<I2CDevice>, DeviceConfig.HardwareAddressing {
 
     /**
--- a/src/share/classes/jdk/dio/i2cbus/I2CPermission.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/i2cbus/I2CPermission.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -60,7 +60,7 @@
  * @see jdk.dio.power.PowerManaged
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_i2cbus")
 public class I2CPermission extends DevicePermission {
 
     /**
--- a/src/share/classes/jdk/dio/i2cbus/package-info.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/i2cbus/package-info.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
--- a/src/share/classes/jdk/dio/modem/ModemSignalEvent.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/modem/ModemSignalEvent.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -39,7 +39,7 @@
  * @see ModemSignalsControl
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_modem")
 public class ModemSignalEvent<P extends Device<? super P>> extends DeviceEvent<P> {
     /**
      * The signal ID.
--- a/src/share/classes/jdk/dio/modem/ModemSignalListener.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/modem/ModemSignalListener.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -40,7 +40,7 @@
  *            the device type the listener is defined for.
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_modem")
 public interface ModemSignalListener<P extends Device<? super P>> extends DeviceEventListener {
 
     /**
--- a/src/share/classes/jdk/dio/modem/ModemSignalsControl.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/modem/ModemSignalsControl.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -37,7 +37,7 @@
  *            the device type implementing this interface.
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_modem")
 public interface ModemSignalsControl<P extends Device<? super P>> {
 
     /**
--- a/src/share/classes/jdk/dio/modem/package-info.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/modem/package-info.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
--- a/src/share/classes/jdk/dio/package-info.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/package-info.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
--- a/src/share/classes/jdk/dio/power/PowerManaged.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/power/PowerManaged.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -117,7 +117,7 @@
  * @see PowerSavingHandler
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_power")
 public interface PowerManaged {
     /*
      * Consider renaming enablePowerSaving and disablePowerSaving to setPowerSavingDirectives and
--- a/src/share/classes/jdk/dio/power/PowerSavingHandler.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/power/PowerSavingHandler.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -47,7 +47,7 @@
  * @see PowerManaged
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_power")
 public interface PowerSavingHandler {
 
     /**
--- a/src/share/classes/jdk/dio/power/package-info.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/power/package-info.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
--- a/src/share/classes/jdk/dio/pwm/GenerationEvent.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/pwm/GenerationEvent.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -36,7 +36,7 @@
  * @see GenerationListener
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_pwm")
 public class GenerationEvent extends DeviceEvent<PWMChannel> {
 
     /**
--- a/src/share/classes/jdk/dio/pwm/GenerationListener.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/pwm/GenerationListener.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -37,7 +37,7 @@
  * @see PWMChannel#startGeneration(int, int, GenerationListener)
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_pwm")
 public interface GenerationListener extends DeviceEventListener, AsyncErrorHandler<PWMChannel> {
 
     /**
--- a/src/share/classes/jdk/dio/pwm/GenerationRoundListener.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/pwm/GenerationRoundListener.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -40,7 +40,7 @@
  * @see PWMChannel#startGeneration PWMChannel.startGeneration
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_pwm")
 public interface GenerationRoundListener extends OutputRoundListener<PWMChannel, IntBuffer> {
 
     /**
--- a/src/share/classes/jdk/dio/pwm/InvalidPulseRateException.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/pwm/InvalidPulseRateException.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -32,7 +32,7 @@
  * @since 1.0
  */
 @SuppressWarnings("serial")
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_pwm")
 public class InvalidPulseRateException extends RuntimeException {
 
     /**
--- a/src/share/classes/jdk/dio/pwm/PWMChannel.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/pwm/PWMChannel.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -72,7 +72,7 @@
  * @see PWMPermission
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_pwm")
 @WeakDontRenameClass
 public interface PWMChannel extends Device<PWMChannel>, BufferAccess<IntBuffer> {
 
--- a/src/share/classes/jdk/dio/pwm/PWMChannelConfig.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/pwm/PWMChannelConfig.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -55,7 +55,7 @@
  * @since 1.0
  */
 @SerializeMe
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_pwm")
 public class PWMChannelConfig implements DeviceConfig<PWMChannel>, DeviceConfig.HardwareAddressing {
 
     /**
--- a/src/share/classes/jdk/dio/pwm/PWMPermission.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/pwm/PWMPermission.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -59,7 +59,7 @@
  * @since 1.0
  */
 @SuppressWarnings("serial")
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_pwm")
 public class PWMPermission extends DevicePermission {
 
     /**
--- a/src/share/classes/jdk/dio/pwm/package-info.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/pwm/package-info.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
--- a/src/share/classes/jdk/dio/spi/AbstractDevice.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/spi/AbstractDevice.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -43,7 +43,7 @@
  * @param <P> the device type the descriptor is defined for.
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_spi")
 @WeakDontRenameClass
 public abstract class AbstractDevice<P extends Device<? super P>> implements Device<P> {
 
--- a/src/share/classes/jdk/dio/spi/DeviceProvider.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/spi/DeviceProvider.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -84,7 +84,7 @@
  * @see jdk.dio.DeviceManager#register DeviceManager.register
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_spi")
 public interface DeviceProvider<P extends Device<? super P>> {
 
     /**
--- a/src/share/classes/jdk/dio/spi/package-info.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/spi/package-info.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
--- a/src/share/classes/jdk/dio/spibus/InvalidWordLengthException.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/spibus/InvalidWordLengthException.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -32,7 +32,7 @@
  * @since 1.0
  */
 @SuppressWarnings("serial")
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_spibus")
 public class InvalidWordLengthException extends RuntimeException {
 
     /**
--- a/src/share/classes/jdk/dio/spibus/SPIDevice.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/spibus/SPIDevice.java	Thu Feb 19 18:42:52 2015 +0300
@@ -99,7 +99,7 @@
  * @see ClosedDeviceException
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_spibus")
 @WeakDontRenameClass
 public interface SPIDevice extends Device<SPIDevice>, ByteChannel, BufferAccess<ByteBuffer> {
 
--- a/src/share/classes/jdk/dio/spibus/SPIDeviceConfig.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/spibus/SPIDeviceConfig.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -80,7 +80,7 @@
  * @since 1.0
  */
 @SerializeMe
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_spibus")
 public final class SPIDeviceConfig implements DeviceConfig<SPIDevice>, DeviceConfig.HardwareAddressing {
 
     /**
--- a/src/share/classes/jdk/dio/spibus/SPIPermission.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/spibus/SPIPermission.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -59,7 +59,7 @@
  * @since 1.0
  */
 @SuppressWarnings("serial")
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_spibus")
 public class SPIPermission extends DevicePermission {
 
     /**
--- a/src/share/classes/jdk/dio/uart/ModemUART.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/uart/ModemUART.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -41,7 +41,7 @@
  *
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_uart")
 @WeakDontRenameClass
 public interface ModemUART extends UART, ModemSignalsControl<ModemUART> {
 }
--- a/src/share/classes/jdk/dio/uart/UART.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/uart/UART.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -68,7 +68,7 @@
  * @see ClosedDeviceException
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_uart")
 @WeakDontRenameClass
 public interface UART extends Device<UART>, ByteChannel, BufferAccess<ByteBuffer> {
 
--- a/src/share/classes/jdk/dio/uart/UARTConfig.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/uart/UARTConfig.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -49,7 +49,7 @@
  * @since 1.0
  */
 @SerializeMe
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_uart")
 public final class UARTConfig implements DeviceConfig<UART>, DeviceConfig.HardwareAddressing {
 
     /**
--- a/src/share/classes/jdk/dio/uart/UARTEvent.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/uart/UARTEvent.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -35,7 +35,7 @@
  * @see UARTEventListener
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_uart")
 public class UARTEvent extends DeviceEvent<UART> {
 
     /**
--- a/src/share/classes/jdk/dio/uart/UARTEventListener.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/uart/UARTEventListener.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -37,7 +37,7 @@
  * @see UARTEvent
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_uart")
 public interface UARTEventListener extends DeviceEventListener {
 
     /**
--- a/src/share/classes/jdk/dio/uart/UARTPermission.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/uart/UARTPermission.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -60,7 +60,7 @@
  * @since 1.0
  */
 @SuppressWarnings("serial")
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_uart")
 public class UARTPermission extends DevicePermission {
 
     /**
--- a/src/share/classes/jdk/dio/uart/package-info.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/uart/package-info.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
--- a/src/share/classes/jdk/dio/watchdog/WatchdogTimer.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/watchdog/WatchdogTimer.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -67,7 +67,7 @@
  *
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_watchdog")
 @WeakDontRenameClass
 public interface WatchdogTimer extends Device<WatchdogTimer> {
 
--- a/src/share/classes/jdk/dio/watchdog/WatchdogTimerConfig.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/watchdog/WatchdogTimerConfig.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -48,7 +48,7 @@
  * @see DeviceManager#open(Class, DeviceConfig)
  */
 @SerializeMe
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_watchdog")
 public class WatchdogTimerConfig implements DeviceConfig<WatchdogTimer>, DeviceConfig.HardwareAddressing {
 
     private String controllerName;
--- a/src/share/classes/jdk/dio/watchdog/WatchdogTimerPermission.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/watchdog/WatchdogTimerPermission.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -59,7 +59,7 @@
  * @see jdk.dio.power.PowerManaged
  */
 @SuppressWarnings("serial")
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_watchdog")
 public class WatchdogTimerPermission extends DevicePermission {
 
     /**
--- a/src/share/classes/jdk/dio/watchdog/WindowedWatchdogTimer.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/watchdog/WindowedWatchdogTimer.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -46,7 +46,7 @@
  *
  * @since 1.0
  */
-@apimarker.API("device-io_1.0")
+@apimarker.API("device-io_1.1_watchdog")
 @WeakDontRenameClass
 public interface WindowedWatchdogTimer extends WatchdogTimer {
 
--- a/src/share/classes/jdk/dio/watchdog/package-info.java	Fri Feb 13 18:19:38 2015 +0300
+++ b/src/share/classes/jdk/dio/watchdog/package-info.java	Thu Feb 19 18:42:52 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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